From eb042cb2c3343111a586a83f25b07bfd9c82c3c7 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@citynetwork.eu>
Date: Thu, 6 Oct 2022 13:22:40 +0200
Subject: [PATCH] Switch codename to Zed

Change-Id: I2a8a91aaa535044966619706734d3ad07714d671
---
 defaults/main.yml                     | 2 +-
 vars/{ubuntu.yml => ubuntu-20.04.yml} | 2 +-
 vars/ubuntu-22.04.yml                 | 9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)
 rename vars/{ubuntu.yml => ubuntu-20.04.yml} (97%)

diff --git a/defaults/main.yml b/defaults/main.yml
index ac0c03f8..23d724c3 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -19,7 +19,7 @@ cache_timeout: 600
 # /etc/openstack-release settings
 openstack_distrib_id: "OSA"
 openstack_distrib_release: "{{ openstack_release | default('master') }}"
-openstack_distrib_code_name: "Yoga"
+openstack_distrib_code_name: "Zed"
 openstack_distrib_description: "OpenStack-Ansible"
 openstack_distrib_file: yes
 openstack_distrib_file_path: "/etc/openstack-release"
diff --git a/vars/ubuntu.yml b/vars/ubuntu-20.04.yml
similarity index 97%
rename from vars/ubuntu.yml
rename to vars/ubuntu-20.04.yml
index c83965b0..1bcd5a38 100644
--- a/vars/ubuntu.yml
+++ b/vars/ubuntu-20.04.yml
@@ -86,7 +86,7 @@ _package_list:
     state: latest
 
 _package_repos:
-  - repo: "deb {{ apt_repo_url | default('http://ubuntu-cloud.archive.canonical.com/ubuntu') }} {{ ansible_facts['lsb']['codename'] }}-updates/{{ openstack_distrib_code_name | lower }} main"
+  - repo: "deb {{ apt_repo_url | default('http://ubuntu-cloud.archive.canonical.com/ubuntu') }} {{ ansible_facts['lsb']['codename'] }}-updates/yoga main"
     state: present
     filename: "uca"
 
diff --git a/vars/ubuntu-22.04.yml b/vars/ubuntu-22.04.yml
index 57e17af8..c83965b0 100644
--- a/vars/ubuntu-22.04.yml
+++ b/vars/ubuntu-22.04.yml
@@ -85,11 +85,10 @@ _package_list:
   - name: ca-certificates
     state: latest
 
-# NOTE(jrosser) there is no UCA repository for Jammy, so disable installation of UCA until one exists
-_package_repos: []
-#  - repo: "deb {{ apt_repo_url | default('http://ubuntu-cloud.archive.canonical.com/ubuntu') }} {{ ansible_facts['lsb']['codename'] }}-updates/{{ openstack_distrib_code_name | lower }} main"
-#    state: present
-#    filename: "uca"
+_package_repos:
+  - repo: "deb {{ apt_repo_url | default('http://ubuntu-cloud.archive.canonical.com/ubuntu') }} {{ ansible_facts['lsb']['codename'] }}-updates/{{ openstack_distrib_code_name | lower }} main"
+    state: present
+    filename: "uca"
 
 _openstack_ca_bundle_path: /etc/ssl/certs/ca-certificates.crt