From ace9a4dbe1a7963b041f3edb3f12aee2319f5983 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Fri, 5 Nov 2021 14:59:16 +0100
Subject: [PATCH 01/19] Fix configuration sync for infra-vms

Change-Id: I60c6a1839a54afbfa9c2c92bd5bbf5b247877e8f
---
 etc/kayobe/infra-vms.yml                             |  2 +-
 .../group_vars/infra-vms/ansible-python-interpreter  |  3 +++
 .../group_vars/infra-vms/network-interfaces          | 12 ++++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 etc/kayobe/inventory/group_vars/infra-vms/ansible-python-interpreter
 create mode 100644 etc/kayobe/inventory/group_vars/infra-vms/network-interfaces

diff --git a/etc/kayobe/infra-vms.yml b/etc/kayobe/infra-vms.yml
index 4fb9cc162..c8aec1cd6 100644
--- a/etc/kayobe/infra-vms.yml
+++ b/etc/kayobe/infra-vms.yml
@@ -53,7 +53,7 @@
 #infra_vm_wait_connection_ssh_extra_args:
 
 # OS family. Needed for config drive generation.
-# infra_vm_os_family:
+#infra_vm_os_family:
 
 ###############################################################################
 # Infrastructure VM node configuration.
diff --git a/etc/kayobe/inventory/group_vars/infra-vms/ansible-python-interpreter b/etc/kayobe/inventory/group_vars/infra-vms/ansible-python-interpreter
new file mode 100644
index 000000000..54abbf23c
--- /dev/null
+++ b/etc/kayobe/inventory/group_vars/infra-vms/ansible-python-interpreter
@@ -0,0 +1,3 @@
+---
+# Use a virtual environment for remote operations.
+ansible_python_interpreter: "{{ virtualenv_path }}/kayobe/bin/python"
diff --git a/etc/kayobe/inventory/group_vars/infra-vms/network-interfaces b/etc/kayobe/inventory/group_vars/infra-vms/network-interfaces
new file mode 100644
index 000000000..015413ded
--- /dev/null
+++ b/etc/kayobe/inventory/group_vars/infra-vms/network-interfaces
@@ -0,0 +1,12 @@
+---
+###############################################################################
+# Network interface definitions for the infra-vms group.
+
+# Overcloud provisioning network IP information.
+# provision_oc_net_interface:
+# provision_oc_net_bridge_ports:
+# provision_oc_net_bond_slaves:
+
+###############################################################################
+# Dummy variable to allow Ansible to accept this file.
+workaround_ansible_issue_8743: yes

From 62f611863248c922c6a61fb0f7938888bc13523a Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Mon, 31 Jan 2022 12:53:25 +0100
Subject: [PATCH 02/19] Sync kayobe-config with kayobe changes

Change-Id: Ia48cbd6a2c5b6b3e16ef4245fdebca2d7233b682
---
 etc/kayobe/bifrost.yml         |  3 ++
 etc/kayobe/infra-vms.yml       |  2 +-
 etc/kayobe/ipa.yml             |  2 +-
 etc/kayobe/kolla.yml           | 15 ++++++++++
 etc/kayobe/networks.yml        |  9 ++++++
 etc/kayobe/openstack.yml       |  4 +--
 etc/kayobe/overcloud-dib.yml   | 55 ++++++++++++++++++++++++++++++++++
 etc/kayobe/proxy.yml           | 16 ++++++++++
 etc/kayobe/seed-hypervisor.yml |  3 ++
 etc/kayobe/seed-vm.yml         |  2 +-
 10 files changed, 106 insertions(+), 5 deletions(-)
 create mode 100644 etc/kayobe/overcloud-dib.yml
 create mode 100644 etc/kayobe/proxy.yml

diff --git a/etc/kayobe/bifrost.yml b/etc/kayobe/bifrost.yml
index 0bfcec726..9cabe8121 100644
--- a/etc/kayobe/bifrost.yml
+++ b/etc/kayobe/bifrost.yml
@@ -86,6 +86,9 @@
 #kolla_bifrost_inspector_port_addition:
 
 # List of extra kernel parameters for the inspector default PXE configuration.
+# Default is {{ inspector_extra_kernel_options }}, defined in inspector.yml.
+# When customising this variable, the default extra kernel parameters should be
+# kept to retain full node inspection capabilities.
 #kolla_bifrost_inspector_extra_kernel_options:
 
 # List of introspection rules for Bifrost's Ironic Inspector service.
diff --git a/etc/kayobe/infra-vms.yml b/etc/kayobe/infra-vms.yml
index c8aec1cd6..dc7ff2336 100644
--- a/etc/kayobe/infra-vms.yml
+++ b/etc/kayobe/infra-vms.yml
@@ -32,7 +32,7 @@
 # Base image for the infra VM root volume. Default is
 # "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
 # when os_distribution is "ubuntu", or
-# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2"
+# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2"
 # otherwise.
 #infra_vm_root_image:
 
diff --git a/etc/kayobe/ipa.yml b/etc/kayobe/ipa.yml
index e0f2094f8..519ca2a59 100644
--- a/etc/kayobe/ipa.yml
+++ b/etc/kayobe/ipa.yml
@@ -16,7 +16,7 @@
 # URL of IPA builder source repository.
 #ipa_builder_source_url:
 
-# Version of IPA builder source repository. Default is master.
+# Version of IPA builder source repository. Default is {{ openstack_branch }}.
 #ipa_builder_source_version:
 
 # List of default Diskimage Builder (DIB) elements to use when building IPA
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index a07406f01..9e37380bd 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -479,6 +479,21 @@
 # default.
 #kolla_internal_fqdn_cacert:
 
+###############################################################################
+# Proxy configuration
+
+# HTTP proxy URL (format: http(s)://[user:password@]proxy_name:port) used by
+# Kolla. Default value is "{{ http_proxy }}".
+#kolla_http_proxy:
+
+# HTTPS proxy URL (format: http(s)://[user:password@]proxy_name:port) used by
+# Kolla. Default value is "{{ https_proxy }}".
+#kolla_https_proxy:
+
+# List of domains, hostnames, IP addresses and networks for which no proxy is
+# used. Default value is "{{ no_proxy }}".
+#kolla_no_proxy:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes
diff --git a/etc/kayobe/networks.yml b/etc/kayobe/networks.yml
index eabe52eb3..904311677 100644
--- a/etc/kayobe/networks.yml
+++ b/etc/kayobe/networks.yml
@@ -196,6 +196,15 @@
 # 'name' items. These tables will be added to /etc/iproute2/rt_tables.
 #network_route_tables:
 
+###############################################################################
+# Network connectivity check configuration.
+
+# External IP address to check. Default is 8.8.8.8.
+#nc_external_ip:
+
+# External hostname to check. Default is google.com.
+#nc_external_hostname:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes
diff --git a/etc/kayobe/openstack.yml b/etc/kayobe/openstack.yml
index f2fe55aa1..1acfd0756 100644
--- a/etc/kayobe/openstack.yml
+++ b/etc/kayobe/openstack.yml
@@ -2,10 +2,10 @@
 ###############################################################################
 # OpenStack release configuration.
 
-# Name of the current OpenStack release. Default is "xena".
+# Name of the current OpenStack release. Default is "master".
 #openstack_release:
 
-# Name of the current OpenStack branch. Default is "stable/xena".
+# Name of the current OpenStack branch. Default is "master".
 #openstack_branch:
 
 ###############################################################################
diff --git a/etc/kayobe/overcloud-dib.yml b/etc/kayobe/overcloud-dib.yml
new file mode 100644
index 000000000..0a95c97e2
--- /dev/null
+++ b/etc/kayobe/overcloud-dib.yml
@@ -0,0 +1,55 @@
+---
+# Overcloud host disk image configuration.
+
+###############################################################################
+# Diskimage-builder configuration for overcloud host disk images.
+
+# Whether to build host disk images with DIB directly instead of through
+# Bifrost. Setting it to true disables Bifrost image build and allows images to
+# be built with the `kayobe overcloud host image build` command. Default value
+# is False. This will change in a future release.
+#overcloud_dib_build_host_images:
+
+# DIB base OS element. Default is {{ os_distribution }}.
+#overcloud_dib_os_element:
+
+# DIB image OS release. Default is {{ os_release }}.
+#overcloud_dib_os_release:
+
+# List of default DIB elements. Default is ["centos", "cloud-init-datasources",
+# "disable-selinux", "enable-serial-console", "vm"] when
+# overcloud_dib_os_element is "centos", or ["ubuntu", "cloud-init-datasources",
+# "enable-serial-console", "vm"] when overcloud_dib_os_element is "ubuntu".
+#overcloud_dib_elements_default:
+
+# List of additional DIB elements. Default is none.
+#overcloud_dib_elements_extra:
+
+# List of DIB elements. Default is a combination of
+# overcloud_dib_elements_default and overcloud_dib_elements_extra.
+#overcloud_dib_elements:
+
+# DIB default environment variables. Default is
+# {"DIB_BOOTLOADER_DEFAULT_CMDLINE": "nofb nomodeset gfxpayload=text
+# net.ifnames=1", "DIB_CLOUD_INIT_DATASOURCES": "ConfigDrive", "DIB_RELEASE":
+# "{{ overcloud_dib_os_release }}"}.
+#overcloud_dib_env_vars_default:
+
+# DIB additional environment variables. Default is none.
+#overcloud_dib_env_vars_extra:
+
+# DIB environment variables. Default is combination of
+# overcloud_dib_env_vars_default and overcloud_dib_env_vars_extra.
+#overcloud_dib_env_vars:
+
+# List of DIB packages to install. Default is to install no extra packages.
+#overcloud_dib_packages:
+
+# Upper constraints file for installing packages in the virtual environment
+# used for building overcloud host disk images. Default is {{
+# pip_upper_constraints_file }}.
+#overcloud_dib_upper_constraints_file:
+
+###############################################################################
+# Dummy variable to allow Ansible to accept this file.
+workaround_ansible_issue_8743: yes
diff --git a/etc/kayobe/proxy.yml b/etc/kayobe/proxy.yml
new file mode 100644
index 000000000..aaf938983
--- /dev/null
+++ b/etc/kayobe/proxy.yml
@@ -0,0 +1,16 @@
+---
+###############################################################################
+# Configuration of HTTP(S) proxies.
+
+# HTTP proxy URL (format: http(s)://[user:password@]proxy_name:port). By
+# default no proxy is used.
+#http_proxy:
+
+# HTTPS proxy URL (format: http(s)://[user:password@]proxy_name:port). By
+# default no proxy is used.
+#https_proxy:
+
+# List of domains, hostnames, IP addresses and networks for which no proxy is
+# used. Defaults to ["127.0.0.1", "localhost", "{{ docker_registry }}"]. This
+# is configured only if either http_proxy or https_proxy is set.
+#no_proxy:
diff --git a/etc/kayobe/seed-hypervisor.yml b/etc/kayobe/seed-hypervisor.yml
index 26cfbe594..ac72fcd3d 100644
--- a/etc/kayobe/seed-hypervisor.yml
+++ b/etc/kayobe/seed-hypervisor.yml
@@ -18,6 +18,9 @@
 # List of extra networks to which seed hypervisor nodes are attached.
 #seed_hypervisor_extra_network_interfaces:
 
+# Whether to enable SNAT on seed hypervisor node. Default is false.
+#seed_hypervisor_enable_snat:
+
 ###############################################################################
 # Seed hypervisor node software RAID configuration.
 
diff --git a/etc/kayobe/seed-vm.yml b/etc/kayobe/seed-vm.yml
index 9ad7a7438..8e20fc789 100644
--- a/etc/kayobe/seed-vm.yml
+++ b/etc/kayobe/seed-vm.yml
@@ -26,7 +26,7 @@
 # Base image for the seed VM root volume. Default is
 # "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
 # when os_distribution is "ubuntu", or
-# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2"
+# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2"
 # otherwise.
 #seed_vm_root_image:
 

From 876a4b78c6d1d97d340284010858619ecd9ed69c Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Thu, 31 Mar 2022 17:26:21 +0100
Subject: [PATCH 03/19] [release] Synchronise with kayobe changes for Yoga

Depends-On: https://review.opendev.org/c/openstack/kayobe/+/836040
Change-Id: Ie990e6f0dfa69863d76e58f13037bc3fb74f9230
---
 etc/kayobe/apt.yml           | 35 +++++++++++++++++++++++++++
 etc/kayobe/bifrost.yml       |  6 +++++
 etc/kayobe/compute.yml       | 47 ++++++++++++++++++++++++++++++++++++
 etc/kayobe/dnf.yml           | 10 ++++++--
 etc/kayobe/globals.yml       |  7 +++---
 etc/kayobe/infra-vms.yml     |  3 +++
 etc/kayobe/kolla.yml         | 17 +++++++++----
 etc/kayobe/openstack.yml     |  4 +--
 etc/kayobe/overcloud-dib.yml | 38 ++++++++++++++++++++++++-----
 etc/kayobe/seed-vm.yml       |  5 +++-
 etc/kayobe/time.yml          |  3 +++
 11 files changed, 156 insertions(+), 19 deletions(-)

diff --git a/etc/kayobe/apt.yml b/etc/kayobe/apt.yml
index 5f278e322..34bfdd2ef 100644
--- a/etc/kayobe/apt.yml
+++ b/etc/kayobe/apt.yml
@@ -11,6 +11,41 @@
 # Apt proxy URL for HTTPS. Default is {{ apt_proxy_http }}.
 #apt_proxy_https:
 
+# List of Apt configuration options. Each item is a dict with the following
+# keys:
+# * content: free-form configuration file content
+# * filename: name of a file in /etc/apt/apt.conf.d/ in which to write the
+#   configuration
+# Default is an empty list.
+#apt_config:
+
+# List of apt keys. Each item is a dict containing the following keys:
+# * url: URL of key
+# * filename: Name of a file in which to store the downloaded key. The
+#   extension should be '.asc' for ASCII-armoured keys, or '.gpg' otherwise.
+# Default is an empty list.
+#apt_keys:
+
+# A list of Apt repositories. Each item is a dict with the following keys:
+# * types: whitespace-separated list of repository types, e.g. deb or deb-src
+#   (optional, default is 'deb')
+# * url: URL of the repository
+# * suites: whitespace-separated list of suites, e.g. focal (optional, default
+#   is ansible_facts.distribution_release)
+# * components: whitespace-separated list of components, e.g. main (optional,
+#   default is 'main')
+# * signed_by: whitespace-separated list of names of GPG keyring files in
+#   apt_keys_path (optional, default is unset)
+# * architecture: whitespace-separated list of architectures that will be used
+#   (optional, default is unset)
+# Default is an empty list.
+#apt_repositories:
+
+# Whether to disable repositories in /etc/apt/sources.list. This may be used
+# when replacing the distribution repositories via apt_repositories.
+# Default is false.
+#apt_disable_sources_list:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes
diff --git a/etc/kayobe/bifrost.yml b/etc/kayobe/bifrost.yml
index 9cabe8121..a9eba19dd 100644
--- a/etc/kayobe/bifrost.yml
+++ b/etc/kayobe/bifrost.yml
@@ -65,6 +65,12 @@
 # Name of disk image file to deploy. Default is "deployment_image.qcow2".
 #kolla_bifrost_deploy_image_filename:
 
+# UUID of the root filesystem contained within the deployment image.
+# See below URL for instructions on how to extract it:
+# https://docs.openstack.org/ironic/latest/admin/raid.html#image-requirements
+# Default is none.
+#kolla_bifrost_deploy_image_rootfs:
+
 ###############################################################################
 # Ironic configuration.
 
diff --git a/etc/kayobe/compute.yml b/etc/kayobe/compute.yml
index cd0ceb247..b1d8d6562 100644
--- a/etc/kayobe/compute.yml
+++ b/etc/kayobe/compute.yml
@@ -143,6 +143,53 @@
 # - state: enabled
 #compute_firewalld_rules:
 
+###############################################################################
+# Compute node host libvirt configuration.
+
+# Whether to enable a host libvirt daemon. Default is true if kolla_enable_nova
+# is true and kolla_enable_nova_libvirt_container is false.
+#compute_libvirt_enabled:
+
+# A dict of default configuration options to write to
+# /etc/libvirt/libvirtd.conf.
+#compute_libvirt_conf_default:
+
+# A dict of additional configuration options to write to
+# /etc/libvirt/libvirtd.conf.
+#compute_libvirt_conf_extra:
+
+# A dict of configuration options to write to /etc/libvirt/libvirtd.conf.
+# Default is a combination of compute_libvirt_conf_default and
+# compute_libvirt_conf_extra.
+#compute_libvirt_conf:
+
+# Numerical log level for libvirtd. Default is 3.
+#compute_libvirtd_log_level:
+
+# A dict of default configuration options to write to
+# /etc/libvirt/qemu.conf.
+#compute_qemu_conf_default:
+
+# A dict of additional configuration options to write to
+# /etc/libvirt/qemu.conf.
+#compute_qemu_conf_extra:
+
+# A dict of configuration options to write to /etc/libvirt/qemu.conf.
+# Default is a combination of compute_qemu_conf_default and
+# compute_qemu_conf_extra.
+#compute_qemu_conf:
+
+# Whether to enable a libvirt TLS listener. Default is false.
+#compute_libvirt_enable_tls:
+
+# Whether to install a Ceph package repository on CentOS and Rocky hosts.
+# Default is true.
+#compute_libvirt_ceph_repo_install:
+
+# Ceph package repository release to install on CentOS and Rocky hosts when
+# compute_libvirt_ceph_repo_install is true. Default is 'pacific'.
+#compute_libvirt_ceph_repo_release:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes
diff --git a/etc/kayobe/dnf.yml b/etc/kayobe/dnf.yml
index cf09b86fd..da4ea22eb 100644
--- a/etc/kayobe/dnf.yml
+++ b/etc/kayobe/dnf.yml
@@ -12,12 +12,18 @@
 # Whether or not to use a local Yum mirror. Default value is 'false'.
 #dnf_use_local_mirror:
 
-# Mirror FQDN for Yum repos. Default value is 'mirror.centos.org'.
+# Mirror FQDN for Yum CentOS repos. Default value is 'mirror.centos.org'.
 #dnf_centos_mirror_host:
 
 # Mirror directory for Yum CentOS repos. Default value is 'centos'.
 #dnf_centos_mirror_directory:
 
+# Mirror FQDN for Yum Rocky repos. Default value is 'dl.rockylinux.org'.
+#dnf_rocky_mirror_host:
+
+# Mirror directory for Yum Rocky repos. Default value is 'pub/rocky'.
+#dnf_rocky_mirror_directory:
+
 # Mirror FQDN for Yum EPEL repos. Default value is
 # 'download.fedoraproject.org'.
 #dnf_epel_mirror_host:
@@ -38,7 +44,7 @@
 #dnf_custom_repos:
 
 # Whether to install the epel-release package. This affects RedHat-based
-# systems only. Default value is 'true'.
+# systems only. Default value is 'false'.
 #dnf_install_epel:
 
 ###############################################################################
diff --git a/etc/kayobe/globals.yml b/etc/kayobe/globals.yml
index a4150d8ec..b926fc9be 100644
--- a/etc/kayobe/globals.yml
+++ b/etc/kayobe/globals.yml
@@ -45,12 +45,13 @@
 ###############################################################################
 # OS distribution.
 
-# OS distribution name. Valid options are "centos", "ubuntu". Default is
-# "centos".
+# OS distribution name. Valid options are "centos", "rocky", "ubuntu". Default
+# is "centos".
 #os_distribution:
 
 # OS release. Valid options are "8-stream" when os_distribution is "centos", or
-# "focal" when os_distribution is "ubuntu".
+# "8" when os_distribution is "rocky", or "focal" when os_distribution is
+# "ubuntu".
 #os_release:
 
 ###############################################################################
diff --git a/etc/kayobe/infra-vms.yml b/etc/kayobe/infra-vms.yml
index dc7ff2336..3274ed806 100644
--- a/etc/kayobe/infra-vms.yml
+++ b/etc/kayobe/infra-vms.yml
@@ -32,6 +32,9 @@
 # Base image for the infra VM root volume. Default is
 # "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
 # when os_distribution is "ubuntu", or
+# http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
+# when os_distribution is "rocky",
+# or
 # "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2"
 # otherwise.
 #infra_vm_root_image:
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 9e37380bd..9885e94cf 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -50,6 +50,11 @@
 # Extra requirements to install inside the kolla-ansible virtualenv.
 #kolla_ansible_venv_extra_requirements:
 
+# Pip requirement specifier for the ansible package. NOTE: This limits the
+# version of ansible used by kolla-ansible to avoid new releases from breaking
+# tested code. Changes to this limit should be tested.
+#kolla_ansible_venv_ansible:
+
 # Path to Kolla-ansible configuration directory. Default is $KOLLA_CONFIG_PATH
 # or /etc/kolla if $KOLLA_CONFIG_PATH is not set.
 #kolla_config_path:
@@ -62,7 +67,8 @@
 # Kolla configuration.
 
 # Kolla base container image distribution. Options are "centos", "debian",
-# "ubuntu". Default is {{ os_distribution }}.
+# "ubuntu". Default is
+# {{ 'centos' if os_distribution == 'rocky' else os_distribution }}.
 #kolla_base_distro:
 
 # Kolla container image type: binary or source. Default is 'source'.
@@ -261,6 +267,7 @@
 #kolla_enable_ceilometer:
 #kolla_enable_ceilometer_horizon_policy_file:
 #kolla_enable_ceilometer_ipmi:
+#kolla_enable_ceilometer_prometheus_pushgateway:
 #kolla_enable_cells:
 #kolla_enable_central_logging:
 #kolla_enable_ceph_rgw:
@@ -368,6 +375,7 @@
 #kolla_enable_nova:
 #kolla_enable_nova_fake:
 #kolla_enable_nova_horizon_policy_file:
+#kolla_enable_nova_libvirt_container:
 #kolla_enable_nova_serialconsole_proxy:
 #kolla_enable_nova_ssh:
 #kolla_enable_octavia:
@@ -385,8 +393,10 @@
 #kolla_enable_prometheus_cadvisor:
 #kolla_enable_prometheus_ceph_mgr_exporter:
 #kolla_enable_prometheus_elasticsearch_exporter:
+#kolla_enable_prometheus_etcd_integration:
 #kolla_enable_prometheus_fluentd_integration:
 #kolla_enable_prometheus_haproxy_exporter:
+#kolla_enable_prometheus_libvirt_exporter:
 #kolla_enable_prometheus_memcached_exporter:
 #kolla_enable_prometheus_mysqld_exporter:
 #kolla_enable_prometheus_node_exporter:
@@ -408,9 +418,9 @@
 #kolla_enable_telegraf:
 #kolla_enable_trove:
 #kolla_enable_trove_singletenant:
+#kolla_enable_venus:
 #kolla_enable_vitrage:
 #kolla_enable_vitrage_prometheus_datasource:
-#kolla_enable_vmtp:
 #kolla_enable_watcher:
 #kolla_enable_zookeeper:
 #kolla_enable_zun:
@@ -456,9 +466,6 @@
 # certificate bundle for the external API.
 #
 # Note that this should be formatted as a literal style block scalar.
-#
-# NOTE: kolla_tls_cert has been renamed to kolla_external_tls_cert. Support for
-# the deprecated name kolla_tls_cert will be removed in a future release.
 #kolla_external_tls_cert:
 
 # Path to a CA certificate file to use for the OS_CACERT environment variable
diff --git a/etc/kayobe/openstack.yml b/etc/kayobe/openstack.yml
index 1acfd0756..67ad989b0 100644
--- a/etc/kayobe/openstack.yml
+++ b/etc/kayobe/openstack.yml
@@ -2,10 +2,10 @@
 ###############################################################################
 # OpenStack release configuration.
 
-# Name of the current OpenStack release. Default is "master".
+# Name of the current OpenStack release. Default is "yoga".
 #openstack_release:
 
-# Name of the current OpenStack branch. Default is "master".
+# Name of the current OpenStack branch. Default is "stable/yoga".
 #openstack_branch:
 
 ###############################################################################
diff --git a/etc/kayobe/overcloud-dib.yml b/etc/kayobe/overcloud-dib.yml
index 0a95c97e2..3d69f8eb1 100644
--- a/etc/kayobe/overcloud-dib.yml
+++ b/etc/kayobe/overcloud-dib.yml
@@ -7,10 +7,19 @@
 # Whether to build host disk images with DIB directly instead of through
 # Bifrost. Setting it to true disables Bifrost image build and allows images to
 # be built with the `kayobe overcloud host image build` command. Default value
-# is False. This will change in a future release.
+# is {{ os_distribution == 'rocky' }}. This will change in a future release.
 #overcloud_dib_build_host_images:
 
-# DIB base OS element. Default is {{ os_distribution }}.
+# List of overcloud host disk images to build. Each element is a dict defining
+# an image in a format accepted by the stackhpc.os-images role. Default is to
+# build an image named "deployment_image" configured with the overcloud_dib_*
+# variables defined below: {"name": "deployment_image", "elements": "{{
+# overcloud_dib_elements }}", "env": "{{ overcloud_dib_env_vars }}",
+# "packages": "{{ overcloud_dib_packages }}"}.
+#overcloud_dib_host_images:
+
+# DIB base OS element. Default is {{ 'rocky-container' if os_distribution ==
+# 'rocky' else os_distribution }}.
 #overcloud_dib_os_element:
 
 # DIB image OS release. Default is {{ os_release }}.
@@ -18,8 +27,11 @@
 
 # List of default DIB elements. Default is ["centos", "cloud-init-datasources",
 # "disable-selinux", "enable-serial-console", "vm"] when
-# overcloud_dib_os_element is "centos", or ["ubuntu", "cloud-init-datasources",
-# "enable-serial-console", "vm"] when overcloud_dib_os_element is "ubuntu".
+# overcloud_dib_os_element is "centos", or ["rocky-container",
+# "cloud-init-datasources", "disable-selinux", "enable-serial-console", "vm"]
+# when overcloud_dib_os_element is "rocky" or
+# ["ubuntu", "cloud-init-datasources", "enable-serial-console", "vm"]
+# when overcloud_dib_os_element is "ubuntu".
 #overcloud_dib_elements_default:
 
 # List of additional DIB elements. Default is none.
@@ -31,8 +43,9 @@
 
 # DIB default environment variables. Default is
 # {"DIB_BOOTLOADER_DEFAULT_CMDLINE": "nofb nomodeset gfxpayload=text
-# net.ifnames=1", "DIB_CLOUD_INIT_DATASOURCES": "ConfigDrive", "DIB_RELEASE":
-# "{{ overcloud_dib_os_release }}"}.
+# net.ifnames=1", "DIB_CLOUD_INIT_DATASOURCES": "ConfigDrive",
+# "DIB_CONTAINERFILE_RUNTIME": "docker", "DIB_CONTAINERFILE_NETWORK_DRIVER":
+# "host", "DIB_RELEASE": "{{ overcloud_dib_os_release }}"}.
 #overcloud_dib_env_vars_default:
 
 # DIB additional environment variables. Default is none.
@@ -45,6 +58,19 @@
 # List of DIB packages to install. Default is to install no extra packages.
 #overcloud_dib_packages:
 
+# List of default git repositories containing Diskimage Builder (DIB) elements.
+# See stackhpc.os-images role for usage. Default is empty.
+#overcloud_dib_git_elements_default:
+
+# List of additional git repositories containing Diskimage Builder (DIB)
+# elements. See stackhpc.os-images role for usage. Default is empty.
+#overcloud_dib_git_elements_extra:
+
+# List of git repositories containing Diskimage Builder (DIB) elements. See
+# stackhpc.os-images role for usage. Default is a combination of
+# overcloud_dib_git_elements_default and overcloud_dib_git_elements_extra.
+#overcloud_dib_git_elements:
+
 # Upper constraints file for installing packages in the virtual environment
 # used for building overcloud host disk images. Default is {{
 # pip_upper_constraints_file }}.
diff --git a/etc/kayobe/seed-vm.yml b/etc/kayobe/seed-vm.yml
index 8e20fc789..f8c2ab8a9 100644
--- a/etc/kayobe/seed-vm.yml
+++ b/etc/kayobe/seed-vm.yml
@@ -25,7 +25,10 @@
 
 # Base image for the seed VM root volume. Default is
 # "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
-# when os_distribution is "ubuntu", or
+# when os_distribution is "ubuntu",
+# http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
+# when os_distribution is "rocky",
+# or
 # "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2"
 # otherwise.
 #seed_vm_root_image:
diff --git a/etc/kayobe/time.yml b/etc/kayobe/time.yml
index 23c1d0dc4..8bfbd3391 100644
--- a/etc/kayobe/time.yml
+++ b/etc/kayobe/time.yml
@@ -30,6 +30,9 @@
 #
 #chrony_ntp_servers:
 
+# Synchronise hardware clock with system time. Default is true.
+#chrony_rtcsync_enabled:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes

From 7d449a92cc9969badc3d6050ac7baea624a496af Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Mon, 11 Apr 2022 14:39:09 +0100
Subject: [PATCH 04/19] proxy: add ansible issue 8743 workaround

Change-Id: I3c202e39586d566bee1f969a0183f3a592fea1bb
---
 etc/kayobe/proxy.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/etc/kayobe/proxy.yml b/etc/kayobe/proxy.yml
index aaf938983..7d63017d6 100644
--- a/etc/kayobe/proxy.yml
+++ b/etc/kayobe/proxy.yml
@@ -14,3 +14,7 @@
 # used. Defaults to ["127.0.0.1", "localhost", "{{ docker_registry }}"]. This
 # is configured only if either http_proxy or https_proxy is set.
 #no_proxy:
+
+###############################################################################
+# Dummy variable to allow Ansible to accept this file.
+workaround_ansible_issue_8743: yes

From 51a93250fcf2d65f16647810eff9483784f0a54f Mon Sep 17 00:00:00 2001
From: OpenStack Release Bot <infra-root@openstack.org>
Date: Thu, 14 Apr 2022 07:05:13 +0000
Subject: [PATCH 05/19] Update .gitreview for stable/yoga

Change-Id: Iaba5f0db07606eb0b6c2d6b62e249df5f1cd5461
---
 .gitreview | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitreview b/.gitreview
index b9adc8dd9..9c0b64bdf 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/kayobe-config.git
+defaultbranch=stable/yoga

From 9a87604a0ef3bb2d8738dfab5f4ada7c6897a62b Mon Sep 17 00:00:00 2001
From: OpenStack Release Bot <infra-root@openstack.org>
Date: Thu, 14 Apr 2022 07:05:16 +0000
Subject: [PATCH 06/19] Update TOX_CONSTRAINTS_FILE for stable/yoga

Update the URL to the upper-constraints file to point to the redirect
rule on releases.openstack.org so that anyone working on this branch
will switch to the correct upper-constraints list automatically when
the requirements repository branches.

Until the requirements repository has as stable/yoga branch, tests will
continue to use the upper-constraints list on master.

Change-Id: I794db08414564f5c903c1c88e32ac34bcfa16913
---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 47adec2e2..24c53fe17 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ skipsdist = True
 [testenv]
 install_command = pip install {opts} {packages}
 deps =
-    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga}
     -r{toxinidir}/test-requirements.txt
 
 [testenv:pep8]

From 7abcd52bbb70171c3cacd8d79b66a8912f647d94 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Wed, 27 Apr 2022 09:53:39 +0200
Subject: [PATCH 07/19] [release] Synchronise with latest kayobe changes for
 Yoga

Change-Id: I4a2973564350fc8097706929a9eeb79598c7ad05
(cherry picked from commit e28ba5c8bb53fcbc5222bcfff0180aa47ccc0ae6)
---
 etc/kayobe/kolla.yml | 1 -
 etc/kayobe/proxy.yml | 6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 9885e94cf..816397e3f 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -328,7 +328,6 @@
 #kolla_enable_horizon_zun:
 #kolla_enable_influxdb:
 #kolla_enable_ironic:
-#kolla_enable_ironic_ipxe:
 #kolla_enable_ironic_neutron_agent:
 #kolla_enable_ironic_pxe_uefi:
 #kolla_enable_iscsid:
diff --git a/etc/kayobe/proxy.yml b/etc/kayobe/proxy.yml
index 7d63017d6..714b9dae5 100644
--- a/etc/kayobe/proxy.yml
+++ b/etc/kayobe/proxy.yml
@@ -11,8 +11,10 @@
 #https_proxy:
 
 # List of domains, hostnames, IP addresses and networks for which no proxy is
-# used. Defaults to ["127.0.0.1", "localhost", "{{ docker_registry }}"]. This
-# is configured only if either http_proxy or https_proxy is set.
+# used. Defaults to ["127.0.0.1", "localhost", "{{ ('http://' ~
+# docker_registry) | urlsplit('hostname') }}"] if docker_registry is set, or
+# ["127.0.0.1", "localhost"] otherwise. This is configured only if either
+# http_proxy or https_proxy is set.
 #no_proxy:
 
 ###############################################################################

From bb1368aa8908592aa94a249b1bf3e91ea9a180d4 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 17 Aug 2022 10:35:23 +0100
Subject: [PATCH 08/19] Yoga: use new default for dnf_install_epel

---
 etc/kayobe/dnf.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/kayobe/dnf.yml b/etc/kayobe/dnf.yml
index 2c536bc67..78d2a57c3 100644
--- a/etc/kayobe/dnf.yml
+++ b/etc/kayobe/dnf.yml
@@ -83,7 +83,7 @@ dnf_epel_gpg_key_url: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8"
 
 # Whether to install the epel-release package. This affects RedHat-based
 # systems only. Default value is 'false'.
-dnf_install_epel: false
+#dnf_install_epel:
 
 ###############################################################################
 # DNF Automatic configuration.

From 5a44819cd77673c3d34bbc7bf123893b5d46fa65 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 17 Aug 2022 10:44:21 +0100
Subject: [PATCH 09/19] Yoga: update README

---
 README.rst | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/README.rst b/README.rst
index ed25963f6..40f94f310 100644
--- a/README.rst
+++ b/README.rst
@@ -2,7 +2,7 @@
 StackHPC Kayobe Configuration
 =============================
 
-This repository provides a base Kayobe configuration for the Xena release
+This repository provides a base Kayobe configuration for the Yoga release
 of StackHPC OpenStack.
 
 StackHPC release train
@@ -45,7 +45,7 @@ when used with Kayobe's `multiple environments
 feature.
 
 This configuration should be consumed using the `StackHPC Kayobe fork
-<https://github.com/stackhpc/kayobe/tree/stackhpc/xena>`__, which includes
+<https://github.com/stackhpc/kayobe/tree/stackhpc/yoga>`__, which includes
 backported support for Ansible collections.
 
 New deployments
@@ -56,7 +56,7 @@ your configuration.
 
 .. code-block:: console
 
-   git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/xena
+   git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/yoga
 
 Existing deployments
 --------------------
@@ -68,7 +68,7 @@ need to merge the changes in this repository into your repository.
 
    git remote add stackhpc https://github.com/stackhpc/stackhpc-kayobe-config
    git fetch stackhpc
-   git merge stackhpc/stackhpc/xena
+   git merge stackhpc/stackhpc/yoga
 
 Updating
 --------
@@ -80,7 +80,7 @@ consume these updates by merging in the changes with their local configuration.
 .. code-block:: console
 
    git fetch stackhpc
-   git merge stackhpc/stackhpc/xena
+   git merge stackhpc/stackhpc/yoga
 
 The intention is to avoid merge conflicts where possible, but there may be
 cases where this is difficult. We are open to discussion on how best to
@@ -125,13 +125,13 @@ Usage
 =====
 
 The local Pulp service will be deployed as a `Seed custom container
-<https://docs.openstack.org/kayobe/xena/configuration/reference/seed-custom-containers.html>`__
+<https://docs.openstack.org/kayobe/yoga/configuration/reference/seed-custom-containers.html>`__
 on next ``kayobe seed service deploy`` or ``kayobe seed service upgrade``.
 
 The following custom playbooks are provided in ``etc/kayobe/ansible/``:
 
 See the Kayobe `custom playbook documentation
-<https://docs.openstack.org/kayobe/xena/custom-ansible-playbooks.html>`__
+<https://docs.openstack.org/kayobe/yoga/custom-ansible-playbooks.html>`__
 for information on how to run them.
 
 * ``pulp-repo-sync.yml``: Pull packages from Ark to the local Pulp. This will
@@ -245,8 +245,8 @@ Clone the Kayobe and Kayobe configuration repositories (this one):
    cd
    mkdir -p src
    pushd src
-   git clone https://github.com/stackhpc/kayobe.git -b stackhpc/xena
-   git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/xena
+   git clone https://github.com/stackhpc/kayobe.git -b stackhpc/yoga
+   git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/yoga
    popd
 
 Create a virtual environment and install Kayobe:
@@ -344,8 +344,8 @@ Clone the Kayobe and Kayobe configuration repositories (this one):
    cd
    mkdir -p src
    pushd src
-   git clone https://github.com/stackhpc/kayobe.git -b stackhpc/xena
-   git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/xena
+   git clone https://github.com/stackhpc/kayobe.git -b stackhpc/yoga
+   git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/yoga
    popd
 
 Create a virtual environment and install Kayobe:
@@ -410,7 +410,7 @@ At this point you are ready to build and push some container images.
    kayobe seed container image build --push
    kayobe overcloud container image build --push
 
-The container images are tagged as ``xena-<datetime>``. This Kayobe
+The container images are tagged as ``yoga-<datetime>``. This Kayobe
 configuration includes a hook that writes the tag to ``~/kolla_tag``, since
 it is not always simple to determine which tag was last applied to built
 images.
@@ -422,7 +422,7 @@ tag as the value of the ``kolla_openstack_release`` variable.
 Resources
 =========
 
-* Kayobe documentation: https://docs.openstack.org/kayobe/xena/
+* Kayobe documentation: https://docs.openstack.org/kayobe/yoga/
 * Kayobe source: https://opendev.org/openstack/kayobe
 * Kayobe bugs: https://storyboard.openstack.org/#!/project/openstack/kayobe-config
 * IRC: #openstack-kolla

From 968d91f7c3f28b3286158c3ab94388349ce156d9 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 17 Aug 2022 10:47:54 +0100
Subject: [PATCH 10/19] Yoga: update release notes

---
 releasenotes/config.yaml      | 2 +-
 releasenotes/source/index.rst | 1 +
 releasenotes/source/yoga.rst  | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/source/yoga.rst

diff --git a/releasenotes/config.yaml b/releasenotes/config.yaml
index 55f94b723..125c1a52d 100644
--- a/releasenotes/config.yaml
+++ b/releasenotes/config.yaml
@@ -1,4 +1,4 @@
 ---
 # This needs to be updated to the latest release.
-default_branch: stackhpc/xena
+default_branch: stackhpc/yoga
 release_tag_re: stackhpc/\d+\.\d+\.\d+\.\d
diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst
index e1ea00229..0e043fd39 100644
--- a/releasenotes/source/index.rst
+++ b/releasenotes/source/index.rst
@@ -7,6 +7,7 @@ Contents
 .. toctree::
    :maxdepth: 2
 
+   yoga
    xena
    wallaby
 
diff --git a/releasenotes/source/yoga.rst b/releasenotes/source/yoga.rst
new file mode 100644
index 000000000..c2181c53a
--- /dev/null
+++ b/releasenotes/source/yoga.rst
@@ -0,0 +1,6 @@
+=========================
+Yoga Series Release Notes
+=========================
+
+.. release-notes::
+   :branch: stackhpc/yoga

From dd654f3bc05ad0345a2ee12aee83749750164f00 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 17 Aug 2022 10:57:05 +0100
Subject: [PATCH 11/19] Yoga: update Github workflows

---
 .github/workflows/stackhpc-container-image-build.yml | 2 +-
 .github/workflows/stackhpc-promote.yml               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/stackhpc-container-image-build.yml b/.github/workflows/stackhpc-container-image-build.yml
index 7cc08eeb4..9c90c1c52 100644
--- a/.github/workflows/stackhpc-container-image-build.yml
+++ b/.github/workflows/stackhpc-container-image-build.yml
@@ -35,7 +35,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: stackhpc/kayobe
-          ref: refs/heads/stackhpc/xena
+          ref: refs/heads/stackhpc/yoga
           path: src/kayobe
 
       # FIXME: Failed in kolla-ansible : Ensure the latest version of pip is installed
diff --git a/.github/workflows/stackhpc-promote.yml b/.github/workflows/stackhpc-promote.yml
index 69a245baf..0b4400178 100644
--- a/.github/workflows/stackhpc-promote.yml
+++ b/.github/workflows/stackhpc-promote.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       # NOTE(mgoddard): Reference only the current release branch here.
-      - stackhpc/xena
+      - stackhpc/yoga
 jobs:
   promote:
     name: Trigger package repository promotion

From 736f797fd54b2d49cd2ed5f7111975462a78ade0 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 17 Aug 2022 10:57:27 +0100
Subject: [PATCH 12/19] Yoga: update tox.ini

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index dd813299b..051c019a0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,7 @@ commands =
 allowlist_externals = rm
 skip_install = true
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga}
   -r{toxinidir}/releasenotes/requirements.txt
 commands =
   rm -rf releasenotes/build/html

From d6b111cfc6461c45a32de67bd35b0eae6dae2aaf Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 17 Aug 2022 10:57:38 +0100
Subject: [PATCH 13/19] Yoga: update requirements.txt

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index ae14ea044..01f79d8b3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-git+https://github.com/stackhpc/kayobe@stackhpc/xena
+git+https://github.com/stackhpc/kayobe@stackhpc/yoga

From abab4cb90e17c30079e362bfd66da427e4ad6486 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 17 Aug 2022 11:00:57 +0100
Subject: [PATCH 14/19] Yoga: update package repositories

---
 etc/kayobe/environments/ci-aio/stackhpc-ci.yml     |  4 ++--
 etc/kayobe/environments/ci-builder/stackhpc-ci.yml |  4 ++--
 etc/kayobe/kolla.yml                               |  6 +++---
 etc/kayobe/pulp-repo-versions.yml                  |  4 ++--
 etc/kayobe/stackhpc.yml                            | 12 ++++++------
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/etc/kayobe/environments/ci-aio/stackhpc-ci.yml b/etc/kayobe/environments/ci-aio/stackhpc-ci.yml
index 246707c97..f10d1a6b6 100644
--- a/etc/kayobe/environments/ci-aio/stackhpc-ci.yml
+++ b/etc/kayobe/environments/ci-aio/stackhpc-ci.yml
@@ -34,13 +34,13 @@ stackhpc_repo_docker_version: "{{ stackhpc_pulp_repo_docker_version }}"
 stackhpc_repo_centos_stream_advanced_virtualization_version: "{{ stackhpc_pulp_repo_centos_stream_8_advanced_virtualization_version }}"
 stackhpc_repo_centos_stream_nfv_extras_version: "{{ stackhpc_pulp_repo_centos_stream_8_nfv_extras_version }}"
 stackhpc_repo_centos_stream_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version }}"
-stackhpc_repo_centos_stream_openstack_xena_version: "{{ stackhpc_pulp_repo_centos_stream_8_openstack_xena_version }}"
+stackhpc_repo_centos_stream_openstack_yoga_version: "{{ stackhpc_pulp_repo_centos_stream_8_openstack_yoga_version }}"
 stackhpc_repo_centos_stream_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_8_opstools_version }}"
 stackhpc_repo_centos_stream_powertools_version: "{{ stackhpc_pulp_repo_centos_stream_8_powertools_version }}"
 stackhpc_repo_centos_stream_storage_ceph_pacific_version: "{{ stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version }}"
 stackhpc_repo_elasticsearch_logstash_kibana_7_x_version: "{{ stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version }}"
 stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
-stackhpc_repo_mariadb_10_5_centos8_version: "{{ stackhpc_pulp_repo_mariadb_10_5_centos8_version }}"
+stackhpc_repo_mariadb_10_6_centos8_version: "{{ stackhpc_pulp_repo_mariadb_10_6_centos8_version }}"
 stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_rabbitmq_erlang_version }}"
 stackhpc_repo_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rabbitmq_server_version }}"
 stackhpc_repo_treasuredata_4_version: "{{ stackhpc_pulp_repo_treasuredata_4_version }}"
diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
index 6607999c0..3da0bd0a0 100644
--- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
+++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
@@ -53,13 +53,13 @@ stackhpc_repo_docker_version: "{{ stackhpc_pulp_repo_docker_version }}"
 stackhpc_repo_centos_stream_advanced_virtualization_version: "{{ stackhpc_pulp_repo_centos_stream_8_advanced_virtualization_version }}"
 stackhpc_repo_centos_stream_nfv_extras_version: "{{ stackhpc_pulp_repo_centos_stream_8_nfv_extras_version }}"
 stackhpc_repo_centos_stream_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version }}"
-stackhpc_repo_centos_stream_openstack_xena_version: "{{ stackhpc_pulp_repo_centos_stream_8_openstack_xena_version }}"
+stackhpc_repo_centos_stream_openstack_yoga_version: "{{ stackhpc_pulp_repo_centos_stream_8_openstack_yoga_version }}"
 stackhpc_repo_centos_stream_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_8_opstools_version }}"
 stackhpc_repo_centos_stream_powertools_version: "{{ stackhpc_pulp_repo_centos_stream_8_powertools_version }}"
 stackhpc_repo_centos_stream_storage_ceph_pacific_version: "{{ stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version }}"
 stackhpc_repo_elasticsearch_logstash_kibana_7_x_version: "{{ stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version }}"
 stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
-stackhpc_repo_mariadb_10_5_centos8_version: "{{ stackhpc_pulp_repo_mariadb_10_5_centos8_version }}"
+stackhpc_repo_mariadb_10_6_centos8_version: "{{ stackhpc_pulp_repo_mariadb_10_6_centos8_version }}"
 stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_rabbitmq_erlang_version }}"
 stackhpc_repo_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rabbitmq_server_version }}"
 stackhpc_repo_treasuredata_4_version: "{{ stackhpc_pulp_repo_treasuredata_4_version }}"
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index feb0a6c38..f0dade390 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -164,8 +164,8 @@ stackhpc_centos_additional_repos:
     file: "CentOS-NFV-extras.repo"
   - url: "{{ stackhpc_repo_centos_stream_nfv_openvswitch_url }}"
     file: "CentOS-NFV-OpenvSwitch.repo"
-  - url: "{{ stackhpc_repo_centos_stream_openstack_xena_url }}"
-    file: "CentOS-OpenStack-xena.repo"
+  - url: "{{ stackhpc_repo_centos_stream_openstack_yoga_url }}"
+    file: "CentOS-OpenStack-yoga.repo"
   - url: "{{ stackhpc_repo_centos_stream_opstools_url }}"
     file: "CentOS-OpsTools.repo"
   - url: "{{ stackhpc_repo_centos_stream_powertools_url }}"
@@ -179,7 +179,7 @@ stackhpc_third_party_repos:
     file: "elasticsearch.repo"
   - url: "{{ stackhpc_repo_grafana_url }}"
     file: "grafana.repo"
-  - url: "{{ stackhpc_repo_mariadb_10_5_centos8_url }}"
+  - url: "{{ stackhpc_repo_mariadb_10_6_centos8_url }}"
     file: "mariadb.repo"
   - url: "{{ stackhpc_repo_rabbitmq_erlang_url }}"
     file: "rabbitmq_rabbitmq-erlang.repo"
diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml
index 7f5398601..3f1153947 100644
--- a/etc/kayobe/pulp-repo-versions.yml
+++ b/etc/kayobe/pulp-repo-versions.yml
@@ -6,7 +6,7 @@ stackhpc_pulp_repo_centos_stream_8_baseos_version: 20220607T061247
 stackhpc_pulp_repo_centos_stream_8_extras_version: 20220401T032901
 stackhpc_pulp_repo_centos_stream_8_nfv_extras_version: 20220609T110556
 stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version: 20220616T202817
-stackhpc_pulp_repo_centos_stream_8_openstack_xena_version: 20220612T035123
+stackhpc_pulp_repo_centos_stream_8_openstack_yoga_version: TODO
 stackhpc_pulp_repo_centos_stream_8_opstools_version: 20220617T100837
 stackhpc_pulp_repo_centos_stream_8_powertools_version: 20220607T061247
 stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version: 20220525T030654
@@ -16,7 +16,7 @@ stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20220525T030654
 stackhpc_pulp_repo_epel_modular_version: 20220604T032730
 stackhpc_pulp_repo_epel_version: 20220617T050552
 stackhpc_pulp_repo_grafana_version: 20220616T113902
-stackhpc_pulp_repo_mariadb_10_5_centos8_version: 20220609T110556
+stackhpc_pulp_repo_mariadb_10_6_centos8_version: TODO
 stackhpc_pulp_repo_rabbitmq_erlang_version: 20220616T113902
 stackhpc_pulp_repo_rabbitmq_server_version: 20220602T033149
 stackhpc_pulp_repo_treasuredata_4_version: 20220429T160649
diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml
index e0d41155c..a5ee28bc1 100644
--- a/etc/kayobe/stackhpc.yml
+++ b/etc/kayobe/stackhpc.yml
@@ -63,9 +63,9 @@ stackhpc_repo_centos_stream_nfv_extras_version: "{{ stackhpc_repo_distribution }
 stackhpc_repo_centos_stream_nfv_openvswitch_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/nfv/x86_64/openvswitch-2/{{ stackhpc_repo_centos_stream_nfv_openvswitch_version }}"
 stackhpc_repo_centos_stream_nfv_openvswitch_version: "{{ stackhpc_repo_distribution }}"
 
-# CentOS Stream 8 - OpenStack Xena
-stackhpc_repo_centos_stream_openstack_xena_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/cloud/x86_64/openstack-xena/{{ stackhpc_repo_centos_stream_openstack_xena_version }}"
-stackhpc_repo_centos_stream_openstack_xena_version: "{{ stackhpc_repo_distribution }}"
+# CentOS Stream 8 - OpenStack Yoga
+stackhpc_repo_centos_stream_openstack_yoga_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/cloud/x86_64/openstack-yoga/{{ stackhpc_repo_centos_stream_openstack_yoga_version }}"
+stackhpc_repo_centos_stream_openstack_yoga_version: "{{ stackhpc_repo_distribution }}"
 
 # CentOS Stream 8 - OpsTools - collectd
 stackhpc_repo_centos_stream_opstools_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/opstools/x86_64/collectd-5/{{ stackhpc_repo_centos_stream_opstools_version }}"
@@ -87,9 +87,9 @@ stackhpc_repo_elasticsearch_logstash_kibana_7_x_version: "{{ stackhpc_repo_distr
 stackhpc_repo_grafana_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/grafana/oss/rpm/{{ stackhpc_repo_grafana_version }}"
 stackhpc_repo_grafana_version: "{{ stackhpc_repo_distribution }}"
 
-# MariaDB 10.5 CentOS 8
-stackhpc_repo_mariadb_10_5_centos8_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/mariadb-10.5/yum/centos8-amd64/{{ stackhpc_repo_mariadb_10_5_centos8_version }}"
-stackhpc_repo_mariadb_10_5_centos8_version: "{{ stackhpc_repo_distribution }}"
+# MariaDB 10.6 CentOS 8
+stackhpc_repo_mariadb_10_6_centos8_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/mariadb-10.6/yum/centos8-amd64/{{ stackhpc_repo_mariadb_10_6_centos8_version }}"
+stackhpc_repo_mariadb_10_6_centos8_version: "{{ stackhpc_repo_distribution }}"
 
 # RabbitMQ - Erlang
 stackhpc_repo_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang/el/8/x86_64/{{ stackhpc_repo_rabbitmq_erlang_version }}"

From b30457576e294105cc397f97fd50f9f0f1d9190d Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 30 Aug 2022 14:45:08 +0000
Subject: [PATCH 15/19] Yoga: update pulp repo versions

---
 etc/kayobe/pulp-repo-versions.yml | 38 +++++++++++++++----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml
index 3f1153947..2cd84e001 100644
--- a/etc/kayobe/pulp-repo-versions.yml
+++ b/etc/kayobe/pulp-repo-versions.yml
@@ -1,25 +1,25 @@
 ---
 # Do not edit! This file is autogenerated by Ansible.
 stackhpc_pulp_repo_centos_stream_8_advanced_virtualization_version: 20211122T102435
-stackhpc_pulp_repo_centos_stream_8_appstream_version: 20220607T061247
-stackhpc_pulp_repo_centos_stream_8_baseos_version: 20220607T061247
+stackhpc_pulp_repo_centos_stream_8_appstream_version: 20220817T082321
+stackhpc_pulp_repo_centos_stream_8_baseos_version: 20220817T082321
 stackhpc_pulp_repo_centos_stream_8_extras_version: 20220401T032901
 stackhpc_pulp_repo_centos_stream_8_nfv_extras_version: 20220609T110556
-stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version: 20220616T202817
-stackhpc_pulp_repo_centos_stream_8_openstack_yoga_version: TODO
+stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version: 20220824T113700
+stackhpc_pulp_repo_centos_stream_8_openstack_yoga_version: 20220819T111114
 stackhpc_pulp_repo_centos_stream_8_opstools_version: 20220617T100837
-stackhpc_pulp_repo_centos_stream_8_powertools_version: 20220607T061247
-stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version: 20220525T030654
-stackhpc_pulp_repo_docker_ce_ubuntu_version: 20220708T132615
-stackhpc_pulp_repo_docker_version: 20220607T061247
-stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20220525T030654
-stackhpc_pulp_repo_epel_modular_version: 20220604T032730
-stackhpc_pulp_repo_epel_version: 20220617T050552
-stackhpc_pulp_repo_grafana_version: 20220616T113902
-stackhpc_pulp_repo_mariadb_10_6_centos8_version: TODO
-stackhpc_pulp_repo_rabbitmq_erlang_version: 20220616T113902
-stackhpc_pulp_repo_rabbitmq_server_version: 20220602T033149
-stackhpc_pulp_repo_treasuredata_4_version: 20220429T160649
-stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20220804T040153
-stackhpc_pulp_repo_ubuntu_focal_security_version: 20220804T040153
-stackhpc_pulp_repo_ubuntu_focal_version: 20220804T040153
+stackhpc_pulp_repo_centos_stream_8_powertools_version: 20220817T082321
+stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version: 20220803T043053
+stackhpc_pulp_repo_docker_ce_ubuntu_version: 20220828T050510
+stackhpc_pulp_repo_docker_version: 20220828T050510
+stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20220825T041159
+stackhpc_pulp_repo_epel_modular_version: 20220828T050510
+stackhpc_pulp_repo_epel_version: 20220830T054227
+stackhpc_pulp_repo_grafana_version: 20220824T113700
+stackhpc_pulp_repo_mariadb_10_6_centos8_version: 20220819T111114
+stackhpc_pulp_repo_rabbitmq_erlang_version: 20220828T050510
+stackhpc_pulp_repo_rabbitmq_server_version: 20220803T043053
+stackhpc_pulp_repo_treasuredata_4_version: 20220823T042339
+stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20220830T054227
+stackhpc_pulp_repo_ubuntu_focal_security_version: 20220830T054227
+stackhpc_pulp_repo_ubuntu_focal_version: 20220830T054227

From 0bb461f147ecac3792db7cab390fda48be978905 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 17 Aug 2022 11:05:17 +0100
Subject: [PATCH 16/19] Yoga: update Kolla build source branches

---
 etc/kayobe/kolla.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index f0dade390..1d5803f11 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -118,11 +118,11 @@ kolla_sources:
   cloudkitty-base:
     type: git
     location: https://github.com/stackhpc/cloudkitty.git
-    reference: stackhpc/xena
+    reference: stackhpc/{{ openstack_release }}
   horizon-plugin-cloudkitty-dashboard:
     type: git
     location: https://github.com/stackhpc/cloudkitty-dashboard.git
-    reference: stackhpc/xena
+    reference: stackhpc/{{ openstack_release }}
   ironic-inspector-additions-stackhpc-inspector-plugins:
     # Install our custom inspector plugins.
     type: git
@@ -131,11 +131,11 @@ kolla_sources:
   magnum-base:
     type: git
     location: https://github.com/stackhpc/magnum.git
-    reference: stackhpc/xena
+    reference: stackhpc/{{ openstack_release }}
   neutron-base-plugin-networking-generic-switch:
     type: git
     location: https://github.com/stackhpc/networking-generic-switch.git
-    reference: stackhpc/xena
+    reference: stackhpc/{{ openstack_release }}
 
 ###############################################################################
 # Kolla image build configuration.

From 73db4eea150fd850da8a6e4069a96be8de2d26e7 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 17 Aug 2022 11:06:24 +0100
Subject: [PATCH 17/19] Yoga: reset image tags

---
 etc/kayobe/kolla.yml         | 2 +-
 etc/kayobe/kolla/globals.yml | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 1d5803f11..d07b8e8bf 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -96,7 +96,7 @@ kolla_docker_registry_password: "{{ stackhpc_docker_registry_password }}"
 
 # Kolla OpenStack release version. This should be a Docker image tag.
 # Default is {{ openstack_release }}.
-kolla_openstack_release: xena-20220728T100435
+kolla_openstack_release: TODO
 
 # Docker tag applied to built container images. Default is
 # {{ kolla_openstack_release }}.
diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml
index 88b1559cc..5505501fb 100644
--- a/etc/kayobe/kolla/globals.yml
+++ b/etc/kayobe/kolla/globals.yml
@@ -4,6 +4,3 @@ enable_docker_repo: "{% raw %}{{ ansible_facts.os_family == 'RedHat' }}{% endraw
 
 docker_yum_baseurl: "{{ stackhpc_repo_docker_url }}"
 docker_yum_gpgkey: "https://download.docker.com/linux/{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %}/gpg"
-
-barbican_tag: xena-20220728T143658
-prometheus_tag: xena-20220728T143658

From 6c2bcf21d879ee1cf09e5201fa7887cb468b9ec2 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 31 Aug 2022 08:59:54 +0100
Subject: [PATCH 18/19] Yoga: stop using StackHPC Bifrost fork

We are not carrying any patches in Yoga.
---
 etc/kayobe/kolla.yml    | 4 ----
 etc/kayobe/stackhpc.yml | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index d07b8e8bf..74ae10069 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -111,10 +111,6 @@ kolla_openstack_release: TODO
 #     location: https://github.com/openstack/ironic
 #     reference: master
 kolla_sources:
-  bifrost-base:
-    type: git
-    location: "{{ kolla_bifrost_source_url }}"
-    reference: "{{ kolla_bifrost_source_version }}"
   cloudkitty-base:
     type: git
     location: https://github.com/stackhpc/cloudkitty.git
diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml
index a5ee28bc1..c025a2ecd 100644
--- a/etc/kayobe/stackhpc.yml
+++ b/etc/kayobe/stackhpc.yml
@@ -106,10 +106,6 @@ stackhpc_repo_treasuredata_4_version: "{{ stackhpc_repo_distribution }}"
 ###############################################################################
 # Sources
 
-# Bifrost source repository.
-stackhpc_bifrost_source_url: "https://github.com/stackhpc/bifrost"
-stackhpc_bifrost_source_version: "stackhpc/{{ openstack_release }}"
-
 # Kolla source repository.
 stackhpc_kolla_source_url: "https://github.com/stackhpc/kolla"
 stackhpc_kolla_source_version: "stackhpc/{{ openstack_release }}"

From 4adbe8dfc4a968d27917986c65576c5bac0a0123 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 31 Aug 2022 15:08:25 +0100
Subject: [PATCH 19/19] Yoga: add initial Kolla container image tags for CentOS

---
 etc/kayobe/kolla.yml         | 2 +-
 etc/kayobe/kolla/globals.yml | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 74ae10069..0289b72dd 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -96,7 +96,7 @@ kolla_docker_registry_password: "{{ stackhpc_docker_registry_password }}"
 
 # Kolla OpenStack release version. This should be a Docker image tag.
 # Default is {{ openstack_release }}.
-kolla_openstack_release: TODO
+kolla_openstack_release: "{% if kolla_base_distro == 'centos' %}yoga-20220831T083604{% endif %}"
 
 # Docker tag applied to built container images. Default is
 # {{ kolla_openstack_release }}.
diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml
index 5505501fb..9a73fb3b1 100644
--- a/etc/kayobe/kolla/globals.yml
+++ b/etc/kayobe/kolla/globals.yml
@@ -4,3 +4,7 @@ enable_docker_repo: "{% raw %}{{ ansible_facts.os_family == 'RedHat' }}{% endraw
 
 docker_yum_baseurl: "{{ stackhpc_repo_docker_url }}"
 docker_yum_gpgkey: "https://download.docker.com/linux/{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %}/gpg"
+
+{% if kolla_base_distro == 'centos' %}
+bifrost_tag: yoga-20220831T122627
+{% endif %}