Xena: use openstack_release for UCA distribution

Author: markgoddard

etc/kayobe/kolla.yml

@@ -194,7 +194,7 @@ stackhpc_ubuntu_focal_repos:
   - "deb {{ stackhpc_repo_ubuntu_focal_url }} focal-updates main universe"
   - "deb {{ stackhpc_repo_ubuntu_focal_url }} focal-backports main universe"
   - "deb {{ stackhpc_repo_ubuntu_focal_security_url }} focal-security main universe"
-  - "deb {{ stackhpc_repo_ubuntu_cloud_archive_url }} focal-updates/wallaby main"
+  - "deb {{ stackhpc_repo_ubuntu_cloud_archive_url }} focal-updates/{{ openstack_release }} main"
 
 # Dict mapping Jinja2 block names in kolla's Docker images to their contents.
 kolla_build_blocks:

etc/kayobe/pulp.yml

@@ -68,7 +68,7 @@ stackhpc_pulp_repository_deb_repos:
     policy: on_demand
     architectures: amd64
     components: main
-    distributions: focal-updates/wallaby
+    distributions: "focal-updates/{{ openstack_release }}"
     mirror: true
     state: present
     required: "{{ stackhpc_pulp_sync_ubuntu_focal | bool }}"