From 16d4f26e27eadf7730a144004dcfde57a4182cdf Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Fri, 12 Jul 2024 09:38:55 +0100
Subject: [PATCH 01/25] Remove stackhpc/neutron source for 2024.1

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

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 1dd2331e1..5e8f404ad 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -139,10 +139,6 @@ kolla_sources:
     type: git
     location: https://github.com/stackhpc/magnum.git
     reference: stackhpc/{{ openstack_release }}
-  neutron-base:
-    type: git
-    location: https://github.com/stackhpc/neutron.git
-    reference: stackhpc/{{ openstack_release }}
   neutron-base-plugin-networking-generic-switch:
     type: git
     location: https://github.com/stackhpc/networking-generic-switch.git

From 2a4afb0fe9fab32844262733b0fdd7bdca4a7fde Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Fri, 12 Jul 2024 09:53:34 +0100
Subject: [PATCH 02/25] Add downstream upper-constraints ENV variable

Bifrost and Kolla-toolbox needs override as their build
process is different to other Kolla images.
---
 etc/kayobe/kolla.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 5e8f404ad..0cf4ba7bf 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -320,7 +320,6 @@ kolla_build_blocks:
     ENV UPPER_CONSTRAINTS_FILE=https://raw.githubusercontent.com/stackhpc/requirements/stackhpc/{{ openstack_release }}/upper-constraints.txt
   bifrost_base_header: |
     ADD additions-archive /
-    ENV ANSIBLE_PIP_VERSION='>=8,<9'
     ENV TOX_CONSTRAINTS_FILE=/requirements/upper-constraints.txt
   grafana_plugins_install: |
     RUN grafana-cli plugins install vonage-status-panel \

From 373625648ce5555f8cfe18ef0580c34fc5e1ff86 Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Fri, 12 Jul 2024 11:24:16 +0100
Subject: [PATCH 03/25] Update pulp repo version for Caracal

---
 etc/kayobe/pulp-repo-versions.yml | 34 ++++++++++++++++---------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml
index 50985a30a..57c68bc2a 100644
--- a/etc/kayobe/pulp-repo-versions.yml
+++ b/etc/kayobe/pulp-repo-versions.yml
@@ -1,21 +1,24 @@
 ---
 # Do not edit! This file is autogenerated by Ansible.
 stackhpc_pulp_repo_centos_stream_9_docker_version: 20240702T000233
-stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20240708T235303
-stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version: 20240702T000233
+stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20240710T002922
+stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version: 20240711T233948
 stackhpc_pulp_repo_centos_stream_9_opstools_version: 20231213T031318
 stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version: 20231104T015751
-stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version: 20240122T172142
+stackhpc_pulp_repo_docker_ce_ubuntu_version: 20231020T014922
 stackhpc_pulp_repo_elrepo_9_version: 20240214T143520
-stackhpc_pulp_repo_epel_9_version: 20240708T235303
-stackhpc_pulp_repo_grafana_version: 20240708T235303
+stackhpc_pulp_repo_epel_9_version: 20240711T091318
+stackhpc_pulp_repo_grafana_version: 20240711T091318
 stackhpc_pulp_repo_opensearch_2_x_version: 20240626T000533
 stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20240626T000533
-stackhpc_pulp_repo_rabbitmq_erlang_version: 20240506T000343
+stackhpc_pulp_repo_rabbitmq_erlang_version: 20240711T091318
 stackhpc_pulp_repo_rabbitmq_server_version: 20240704T001154
-stackhpc_pulp_repo_rhel_9_influxdb_version: 20240702T000233
+stackhpc_pulp_repo_rhel_9_rabbitmq_erlang_version: 20240711T091318
+stackhpc_pulp_repo_rhel_9_rabbitmq_server_version: 20240711T091318
 stackhpc_pulp_repo_rhel_9_mariadb_10_6_version: 20240517T012522
+stackhpc_pulp_repo_rhel_9_mariadb_10_11_version: 20240711T091318
 stackhpc_pulp_repo_rhel_9_treasuredata_4_version: 20231130T012511
+stackhpc_pulp_repo_rhel_9_treasuredata_5_version: 20240711T091318
 stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231207T013715
 stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231206T014015
 stackhpc_pulp_repo_rocky_9_1_crb_version: 20231211T120328
@@ -26,17 +29,16 @@ stackhpc_pulp_repo_rocky_9_2_baseos_version: 20231211T120328
 stackhpc_pulp_repo_rocky_9_2_crb_version: 20231207T013715
 stackhpc_pulp_repo_rocky_9_2_extras_version: 20231207T013715
 stackhpc_pulp_repo_rocky_9_2_highavailability_version: 20231208T011702
-stackhpc_pulp_repo_rocky_9_3_appstream_version: 20240416T010957
-stackhpc_pulp_repo_rocky_9_3_baseos_version: 20240413T014042
-stackhpc_pulp_repo_rocky_9_3_crb_version: 20240413T014042
-stackhpc_pulp_repo_rocky_9_3_extras_version: 20240413T014042
-stackhpc_pulp_repo_rocky_9_3_highavailability_version: 20240404T012937
+stackhpc_pulp_repo_rocky_9_3_appstream_version: 20240508T001430
+stackhpc_pulp_repo_rocky_9_3_baseos_version: 20240509T005935
+stackhpc_pulp_repo_rocky_9_3_crb_version: 20240429T003818
+stackhpc_pulp_repo_rocky_9_3_extras_version: 20240506T000343
+stackhpc_pulp_repo_rocky_9_3_highavailability_version: 20240510T001129
 stackhpc_pulp_repo_rocky_9_4_appstream_version: 20240704T001154
 stackhpc_pulp_repo_rocky_9_4_baseos_version: 20240707T011413
 stackhpc_pulp_repo_rocky_9_4_crb_version: 20240702T000233
 stackhpc_pulp_repo_rocky_9_4_extras_version: 20240707T235817
 stackhpc_pulp_repo_rocky_9_4_highavailability_version: 20240629T235004
-stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20240708T235303
-stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20240418T070026
-stackhpc_pulp_repo_ubuntu_jammy_security_version: 20240418T043733
-stackhpc_pulp_repo_ubuntu_jammy_version: 20240418T043733
+stackhpc_pulp_repo_ubuntu_jammy_version: 20240712T032006
+stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20240712T074902
+stackhpc_pulp_repo_ubuntu_jammy_security_version: 20240712T032006

From 2923ece884e97836ad4960819a951e51cbe05e6f Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Fri, 19 Jul 2024 11:23:57 +0100
Subject: [PATCH 04/25] Update Openstack RPM repo to Caracal

---
 etc/kayobe/pulp.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml
index 9f87b915d..70b78f228 100644
--- a/etc/kayobe/pulp.yml
+++ b/etc/kayobe/pulp.yml
@@ -293,11 +293,10 @@ stackhpc_pulp_rpm_repos:
     base_path: "centos/9-stream/nfv/x86_64/openvswitch-2/"
     required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
 
-
-  - name: CentOS Stream 9 - OpenStack Antelope
-    url: "{{ stackhpc_release_pulp_content_url }}/centos/9-stream/cloud/x86_64/openstack-antelope/{{ stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version }}"
-    distribution_name: "centos-stream-9-openstack-antelope-"
-    base_path: "centos/9-stream/cloud/x86_64/openstack-antelope/"
+  - name: CentOS Stream 9 - OpenStack Caracal
+    url: "{{ stackhpc_release_pulp_content_url }}/centos/9-stream/cloud/x86_64/openstack-caracal/{{ stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version }}"
+    distribution_name: "centos-stream-9-openstack-caracal-"
+    base_path: "centos/9-stream/cloud/x86_64/openstack-caracal/"
     required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
 
   - name: CentOS 9 - OpsTools - collectd

From b956cde736da41847f641beaa18af2d9004d356b Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Fri, 19 Jul 2024 14:44:04 +0100
Subject: [PATCH 05/25] Set koll_build_args as empty dict to avoid build error

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

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 0cf4ba7bf..1ad1c4975 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -450,7 +450,7 @@ kolla_build_customizations_ubuntu: {}
 kolla_build_customizations: "{{ kolla_build_customizations_common | combine(kolla_build_customizations_rocky if kolla_base_distro == 'rocky' else kolla_build_customizations_ubuntu) }}"
 
 # Dict mapping Kolla Dockerfile ARG names to their values.
-#kolla_build_args:
+kolla_build_args: {}
 
 ###############################################################################
 # Kolla-ansible inventory configuration.

From f64e2782adae39eb39b94b387fbf7789379bd588 Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Fri, 19 Jul 2024 15:07:26 +0100
Subject: [PATCH 06/25] Update StackHPC Openstack rpm repo target to Caracal

---
 etc/kayobe/environments/ci-aio/stackhpc-ci.yml       | 2 +-
 etc/kayobe/environments/ci-builder/stackhpc-ci.yml   | 2 +-
 etc/kayobe/environments/ci-multinode/stackhpc-ci.yml | 2 +-
 etc/kayobe/kolla.yml                                 | 6 +++---
 etc/kayobe/stackhpc.yml                              | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/etc/kayobe/environments/ci-aio/stackhpc-ci.yml b/etc/kayobe/environments/ci-aio/stackhpc-ci.yml
index eee5c0f3f..74856bb0d 100644
--- a/etc/kayobe/environments/ci-aio/stackhpc-ci.yml
+++ b/etc/kayobe/environments/ci-aio/stackhpc-ci.yml
@@ -34,7 +34,7 @@ stackhpc_repo_ubuntu_jammy_cve_2024_6387_version: ""
 stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
 stackhpc_repo_docker_ce_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version }}"
 stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
-stackhpc_repo_centos_stream_9_openstack_antelope_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version }}"
+stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version }}"
 stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
 stackhpc_repo_centos_stream_9_storage_ceph_quincy_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version }}"
 stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
index ae77f5d90..596625853 100644
--- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
+++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
@@ -54,7 +54,7 @@ stackhpc_repo_ubuntu_jammy_cve_2024_6387_version: ""
 stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
 stackhpc_repo_docker_ce_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version }}"
 stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
-stackhpc_repo_centos_stream_9_openstack_antelope_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version }}"
+stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version }}"
 stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
 stackhpc_repo_centos_stream_9_storage_ceph_quincy_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version }}"
 stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
diff --git a/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml b/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml
index ebc9915a2..35d3e35d9 100644
--- a/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml
+++ b/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml
@@ -31,7 +31,7 @@ stackhpc_repo_ubuntu_jammy_cve_2024_6387_version: ""
 stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
 stackhpc_repo_docker_ce_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version }}"
 stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
-stackhpc_repo_centos_stream_9_openstack_antelope_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version }}"
+stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version }}"
 stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
 stackhpc_repo_centos_stream_9_storage_ceph_quincy_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version }}"
 stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 1ad1c4975..9d73963b8 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -164,9 +164,9 @@ stackhpc_rocky_9_additional_repos:
   - url: "{{ stackhpc_repo_centos_stream_9_nfv_openvswitch_url }}"
     file: "CentOS-NFV-OpenvSwitch.repo"
     tag: "centos-nfv-openvswitch"
-  - url: "{{ stackhpc_repo_centos_stream_9_openstack_antelope_url }}"
-    file: "CentOS-OpenStack-antelope.repo"
-    tag: "centos-openstack-antelope"
+  - url: "{{ stackhpc_repo_centos_stream_9_openstack_caracal_url }}"
+    file: "CentOS-OpenStack-caracal.repo"
+    tag: "centos-openstack-caracal"
   - url: "{{ stackhpc_repo_centos_stream_9_opstools_url }}"
     file: "CentOS-OpsTools.repo"
     tag: "centos-opstools"
diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml
index 9606634a9..843febf46 100644
--- a/etc/kayobe/stackhpc.yml
+++ b/etc/kayobe/stackhpc.yml
@@ -68,9 +68,9 @@ stackhpc_repo_rabbitmq_server_version: "{{ stackhpc_repo_distribution }}"
 stackhpc_repo_centos_stream_9_nfv_openvswitch_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/nfv/x86_64/openvswitch-2/{{ stackhpc_repo_centos_stream_9_nfv_openvswitch_version }}"
 stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_repo_distribution }}"
 
-# CentOS Stream 9 - OpenStack Antelope
-stackhpc_repo_centos_stream_9_openstack_antelope_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/cloud/x86_64/openstack-antelope/{{ stackhpc_repo_centos_stream_9_openstack_antelope_version }}"
-stackhpc_repo_centos_stream_9_openstack_antelope_version: "{{ stackhpc_repo_distribution }}"
+# CentOS Stream 9 - OpenStack Caracal
+stackhpc_repo_centos_stream_9_openstack_caracal_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/cloud/x86_64/openstack-caracal/{{ stackhpc_repo_centos_stream_9_openstack_caracal_version }}"
+stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_repo_distribution }}"
 
 # CentOS Stream 9 - OpsTools - collectd
 stackhpc_repo_centos_stream_9_opstools_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/opstools/x86_64/collectd-5/{{ stackhpc_repo_centos_stream_9_opstools_version }}"

From a25beee024a538aab554bf747cc111cac30b6aba Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Fri, 19 Jul 2024 15:28:19 +0100
Subject: [PATCH 07/25] Re-add omitted rhel9 influxdb repo

---
 etc/kayobe/pulp-repo-versions.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml
index 57c68bc2a..1472b2b9f 100644
--- a/etc/kayobe/pulp-repo-versions.yml
+++ b/etc/kayobe/pulp-repo-versions.yml
@@ -15,6 +15,7 @@ stackhpc_pulp_repo_rabbitmq_erlang_version: 20240711T091318
 stackhpc_pulp_repo_rabbitmq_server_version: 20240704T001154
 stackhpc_pulp_repo_rhel_9_rabbitmq_erlang_version: 20240711T091318
 stackhpc_pulp_repo_rhel_9_rabbitmq_server_version: 20240711T091318
+stackhpc_pulp_repo_rhel_9_influxdb_version: 20240702T000233
 stackhpc_pulp_repo_rhel_9_mariadb_10_6_version: 20240517T012522
 stackhpc_pulp_repo_rhel_9_mariadb_10_11_version: 20240711T091318
 stackhpc_pulp_repo_rhel_9_treasuredata_4_version: 20231130T012511

From 9dc167e979392f86bbf692f93fda1dfa534112bb Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Mon, 22 Jul 2024 11:47:52 +0100
Subject: [PATCH 08/25] Update centos9 caracal repo version

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

diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml
index 1472b2b9f..d53d7199c 100644
--- a/etc/kayobe/pulp-repo-versions.yml
+++ b/etc/kayobe/pulp-repo-versions.yml
@@ -2,7 +2,7 @@
 # Do not edit! This file is autogenerated by Ansible.
 stackhpc_pulp_repo_centos_stream_9_docker_version: 20240702T000233
 stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20240710T002922
-stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version: 20240711T233948
+stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version: 20240718T001130
 stackhpc_pulp_repo_centos_stream_9_opstools_version: 20231213T031318
 stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version: 20231104T015751
 stackhpc_pulp_repo_docker_ce_ubuntu_version: 20231020T014922

From d62feb10b03068902c2c74cee85600eec8531f45 Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Mon, 22 Jul 2024 15:48:14 +0100
Subject: [PATCH 09/25] define openstack-base from kolla_sources

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

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 9d73963b8..6c45a9db1 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -143,6 +143,10 @@ kolla_sources:
     type: git
     location: https://github.com/stackhpc/networking-generic-switch.git
     reference: stackhpc/{{ openstack_release }}
+  openstack-base:
+    type: git
+    location: https://github.com/stackhpc/requirements.git
+    reference: stackhpc/{{ openstack_release }}
 
 ###############################################################################
 # Kolla image build configuration.

From 0bf6a15a1e3e4ba9a35de3c9ec9b6afc13d65c52 Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Tue, 23 Jul 2024 11:26:39 +0100
Subject: [PATCH 10/25] Use upstream requirements for testing

---
 etc/kayobe/kolla.yml              | 4 ----
 etc/kayobe/kolla/kolla-build.conf | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 6c45a9db1..9d73963b8 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -143,10 +143,6 @@ kolla_sources:
     type: git
     location: https://github.com/stackhpc/networking-generic-switch.git
     reference: stackhpc/{{ openstack_release }}
-  openstack-base:
-    type: git
-    location: https://github.com/stackhpc/requirements.git
-    reference: stackhpc/{{ openstack_release }}
 
 ###############################################################################
 # Kolla image build configuration.
diff --git a/etc/kayobe/kolla/kolla-build.conf b/etc/kayobe/kolla/kolla-build.conf
index b444eae17..0bc9f87a8 100644
--- a/etc/kayobe/kolla/kolla-build.conf
+++ b/etc/kayobe/kolla/kolla-build.conf
@@ -10,7 +10,3 @@ base_tag = 9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}
 {% endif %}
 build_args = {{ kolla_build_args.items() | map('join', ':') | join(',') }}
 
-[openstack-base]
-type = git
-location = https://github.com/stackhpc/requirements
-reference = stackhpc/{{ openstack_release }}

From fdc5d78f3c3fb538346ca43876e9dc2a8185a53f Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Tue, 23 Jul 2024 16:33:37 +0100
Subject: [PATCH 11/25] bring back stackhpc requirements

---
 etc/kayobe/kolla/kolla-build.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/etc/kayobe/kolla/kolla-build.conf b/etc/kayobe/kolla/kolla-build.conf
index 0bc9f87a8..b444eae17 100644
--- a/etc/kayobe/kolla/kolla-build.conf
+++ b/etc/kayobe/kolla/kolla-build.conf
@@ -10,3 +10,7 @@ base_tag = 9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}
 {% endif %}
 build_args = {{ kolla_build_args.items() | map('join', ':') | join(',') }}
 
+[openstack-base]
+type = git
+location = https://github.com/stackhpc/requirements
+reference = stackhpc/{{ openstack_release }}

From 17aee98b7d6ee62aee5c44feafc514a3e10f086d Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Thu, 25 Jul 2024 14:03:54 +0100
Subject: [PATCH 12/25] Remove antelope prometheus version override

---
 etc/kayobe/kolla.yml | 80 --------------------------------------------
 1 file changed, 80 deletions(-)

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 9d73963b8..2c08320c2 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -334,86 +334,6 @@ kolla_build_blocks:
     {% set magnum_capi_packages = ['magnum-capi-helm==1.0.0'] %}
     RUN {{ macros.install_pip(magnum_capi_packages | customizable("pip_packages")) }}
     {% endraw %}
-  prometheus_alertmanager_repository_version: | # 2023.1 kolla has 0.24.0
-    {% raw %}
-    ARG prometheus_alertmanager_version=0.26.0
-    ARG prometheus_alertmanager_archive=alertmanager-${prometheus_alertmanager_version}.linux-{{debian_arch}}.tar.gz
-    ARG prometheus_alertmanager_sha256sums_url=https://github.com/prometheus/alertmanager/releases/download/v${prometheus_alertmanager_version}/sha256sums.txt
-    ARG prometheus_alertmanager_download_url=https://github.com/prometheus/alertmanager/releases/download/v${prometheus_alertmanager_version}/${prometheus_alertmanager_archive}
-    {% endraw %}
-  prometheus_blackbox_exporter_repository_version: | # 2023.1 kolla has 0.23.0
-    {% raw %}
-    ARG blackbox_exporter_version=0.25.0
-    ARG blackbox_exporter_url=https://github.com/prometheus/blackbox_exporter/releases/download/v${blackbox_exporter_version}/blackbox_exporter-${blackbox_exporter_version}.linux-{{debian_arch}}.tar.gz
-    {% endraw %}
-  prometheus_cadvisor_repository_version: | # 2023.1 kolla has 0.48.0
-    {% raw %}
-    ARG prometheus_cadvisor_version=0.49.1
-    {% if debian_arch == 'arm64' %}
-    ARG prometheus_cadvisor_sha256sum=c535f46d789599f25c7c680af193d4402da27a98d9828eb2ec916af6256e0c0c
-    {% else %}
-    ARG prometheus_cadvisor_sha256sum=1d5cc701a3fcdf1e8ed1c86da5304b896a6997d9e6673139e78a6f87812495b0
-    {% endif %}
-    ARG prometheus_cadvisor_url=https://github.com/google/cadvisor/releases/download/v${prometheus_cadvisor_version}/cadvisor-v${prometheus_cadvisor_version}-linux-{{debian_arch}}
-    {% endraw %}
-  haproxy_exporter_repository_version: | # 2023.1 kolla has 0.13.0
-    {% raw %}
-    ARG haproxy_exporter_version=0.15.0
-    ARG haproxy_exporter_url=https://github.com/prometheus/haproxy_exporter/releases/download/v${haproxy_exporter_version}/haproxy_exporter-${haproxy_exporter_version}.linux-{{debian_arch}}.tar.gz
-    {% endraw %}
-  prometheus_memcached_exporter_repository_version: | #  2023.1 kolla has 0.10.0
-    {% raw %}
-    ARG memcached_exporter_version=0.14.3
-    ARG memcached_exporter_url=https://github.com/prometheus/memcached_exporter/releases/download/v${memcached_exporter_version}/memcached_exporter-${memcached_exporter_version}.linux-{{debian_arch}}.tar.gz
-    {% endraw %}
-  prometheus_msteams_repository_version: | # 2023.1 kolla has 1.5.1
-    {% raw %}
-    ARG prometheus_msteams_version=1.5.2
-    ARG prometheus_msteams_sha256sum=0f4df9ee31e655d1ec876ea2c53ab5ae5b07143ef21b9190e61b4d52839e135c
-    ARG prometheus_msteams_url=https://github.com/prometheus-msteams/prometheus-msteams/releases/download/v${prometheus_msteams_version}/prometheus-msteams-linux-{{debian_arch}}
-    {% endraw %}
-  prometheus_mtail_version: | # 2023.1 kolla has 3.0.0-rc50
-    {% raw %}
-    ARG prometheus_mtail_version=3.0.0-rc53
-    ARG prometheus_mtail_url=https://github.com/google/mtail/releases/download/v${prometheus_mtail_version}/mtail_${prometheus_mtail_version}_linux_{{debian_arch}}.tar.gz
-    {% endraw %}
-  mysqld_exporter_repository_version: | # 2023.1 kolla has 0.15.0
-    {% raw %}
-    ARG mysqld_exporter_version=0.15.1
-    ARG mysqld_exporter_url=https://github.com/prometheus/mysqld_exporter/releases/download/v${mysqld_exporter_version}/mysqld_exporter-${mysqld_exporter_version}.linux-{{debian_arch}}.tar.gz
-    {% endraw %}
-  node_exporter_repository_version: | # 2023.1 kolla has 1.4.0
-    {% raw %}
-    ARG node_exporter_version=1.7.0
-    {% if debian_arch == 'arm64' %}
-    ARG node_exporter_sha256sum=e386c7b53bc130eaf5e74da28efc6b444857b77df8070537be52678aefd34d96
-    {% else %}
-    ARG node_exporter_sha256sum=a550cd5c05f760b7934a2d0afad66d2e92e681482f5f57a917465b1fba3b02a6
-    {% endif %}
-    ARG node_exporter_url=https://github.com/prometheus/node_exporter/releases/download/v{$node_exporter_version}/node_exporter-${node_exporter_version}.linux-{{debian_arch}}.tar.gz
-    {% endraw %}
-  prometheus_openstack_exporter_repository_version: | # 2023.1 kolla has 1.6.0
-    {% raw %}
-    ARG prometheus_openstack_exporter_version=1.7.0
-    ARG prometheus_openstack_exporter_url=https://github.com/openstack-exporter/openstack-exporter/releases/download/v${prometheus_openstack_exporter_version}/openstack-exporter_${prometheus_openstack_exporter_version}_linux_{{debian_arch}}.tar.gz
-    {% endraw %}
-  prometheus_ovn_exporter_repository_version: | # 2023.1 kolla has 1.0.6
-    {% raw %}
-    {% if base_arch == 'x86_64' %}
-    ARG ovn_arch=amd64
-    {% elif base_arch == 'aarch64' %}
-    ARG ovn_arch=arm64
-    {% endif %}
-    ARG prometheus_ovn_version=1.0.7
-    ARG prometheus_ovn_cksum_url=https://github.com/greenpau/ovn_exporter/releases/download/v${prometheus_ovn_version}/checksums.txt
-    ARG ovn_exporter_tgz=ovn-exporter_${prometheus_ovn_version}_linux_${ovn_arch}.tar.gz
-    ARG prometheus_ovn_url=https://github.com/greenpau/ovn_exporter/releases/download/v${prometheus_ovn_version}/${ovn_exporter_tgz}
-    {% endraw %}
-  prometheus_v2_server_repository_version: | # 2023.1 kolla has 2.38.0
-    {% raw %}
-    ARG prometheus_version=2.51.1
-    ARG prometheus_url=https://github.com/prometheus/prometheus/releases/download/v${prometheus_version}/prometheus-${prometheus_version}.linux-{{debian_arch}}.tar.gz
-    {% endraw %}
 
 # Dict mapping image customization variable names to their values.
 # Each variable takes the form:

From adfec5648f55f0db83b6072c9b1f4f9a1a6d8cee Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Thu, 25 Jul 2024 14:34:26 +0100
Subject: [PATCH 13/25] Bump Ceph to Reef

---
 etc/kayobe/environments/ci-aio/stackhpc-ci.yml       | 2 +-
 etc/kayobe/environments/ci-builder/stackhpc-ci.yml   | 2 +-
 etc/kayobe/environments/ci-multinode/stackhpc-ci.yml | 2 +-
 etc/kayobe/kolla.yml                                 | 6 +++---
 etc/kayobe/pulp-repo-versions.yml                    | 2 +-
 etc/kayobe/pulp.yml                                  | 8 ++++----
 etc/kayobe/stackhpc.yml                              | 6 +++---
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/etc/kayobe/environments/ci-aio/stackhpc-ci.yml b/etc/kayobe/environments/ci-aio/stackhpc-ci.yml
index 74856bb0d..f196d9e5e 100644
--- a/etc/kayobe/environments/ci-aio/stackhpc-ci.yml
+++ b/etc/kayobe/environments/ci-aio/stackhpc-ci.yml
@@ -36,7 +36,7 @@ stackhpc_repo_docker_ce_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_docker_ce_u
 stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
 stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version }}"
 stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
-stackhpc_repo_centos_stream_9_storage_ceph_quincy_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version }}"
+stackhpc_repo_centos_stream_9_storage_ceph_reef_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version }}"
 stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
 stackhpc_repo_rhel_9_treasuredata_4_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_4_version }}"
 stackhpc_repo_rhel_9_mariadb_10_6_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_6_version }}"
diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
index 596625853..997473fe6 100644
--- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
+++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
@@ -56,7 +56,7 @@ stackhpc_repo_docker_ce_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_docker_ce_u
 stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
 stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version }}"
 stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
-stackhpc_repo_centos_stream_9_storage_ceph_quincy_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version }}"
+stackhpc_repo_centos_stream_9_storage_ceph_reef_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version }}"
 stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
 stackhpc_repo_rhel_9_treasuredata_4_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_4_version }}"
 stackhpc_repo_rhel_9_mariadb_10_6_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_6_version }}"
diff --git a/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml b/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml
index 35d3e35d9..77644582c 100644
--- a/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml
+++ b/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml
@@ -33,7 +33,7 @@ stackhpc_repo_docker_ce_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_docker_ce_u
 stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
 stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version }}"
 stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
-stackhpc_repo_centos_stream_9_storage_ceph_quincy_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version }}"
+stackhpc_repo_centos_stream_9_storage_ceph_reef_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version }}"
 stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
 stackhpc_repo_rhel_9_treasuredata_4_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_4_version }}"
 stackhpc_repo_rhel_9_mariadb_10_6_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_6_version }}"
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 2c08320c2..c058fc4d6 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -191,9 +191,9 @@ stackhpc_rocky_9_third_party_repos:
   - url: "{{ stackhpc_repo_rhel_9_influxdb_url }}"
     file: "influxdb.repo"
     tag: "influxdb"
-  - url: "{{ stackhpc_repo_centos_stream_9_storage_ceph_quincy_url }}"
-    file: "CentOS-Ceph-Quincy.repo"
-    tag: "centos-ceph-quincy"
+  - url: "{{ stackhpc_repo_centos_stream_9_storage_ceph_reef_url }}"
+    file: "CentOS-Ceph-Reef.repo"
+    tag: "centos-ceph-reef"
   - url: "{{ stackhpc_repo_rabbitmq_erlang_url }}"
     file: "rabbitmq_rabbitmq-erlang.repo"
     tag: "rabbitmq_rabbitmq-erlang"
diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml
index d53d7199c..1a495480e 100644
--- a/etc/kayobe/pulp-repo-versions.yml
+++ b/etc/kayobe/pulp-repo-versions.yml
@@ -4,7 +4,7 @@ stackhpc_pulp_repo_centos_stream_9_docker_version: 20240702T000233
 stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20240710T002922
 stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version: 20240718T001130
 stackhpc_pulp_repo_centos_stream_9_opstools_version: 20231213T031318
-stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version: 20231104T015751
+stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version: 20240502T000614
 stackhpc_pulp_repo_docker_ce_ubuntu_version: 20231020T014922
 stackhpc_pulp_repo_elrepo_9_version: 20240214T143520
 stackhpc_pulp_repo_epel_9_version: 20240711T091318
diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml
index 70b78f228..ee599d8aa 100644
--- a/etc/kayobe/pulp.yml
+++ b/etc/kayobe/pulp.yml
@@ -305,10 +305,10 @@ stackhpc_pulp_rpm_repos:
     base_path: "centos/9-stream/opstools/x86_64/collectd-5/"
     required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
 
-  - name: CentOS Stream 9 - Ceph Quincy
-    url: "{{ stackhpc_release_pulp_content_url }}/centos/9-stream/storage/x86_64/ceph-quincy/{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version }}"
-    distribution_name: "centos-stream-9-ceph-quincy-"
-    base_path: "centos/9-stream/storage/x86_64/ceph-quincy/"
+  - name: CentOS Stream 9 - Ceph Reef
+    url: "{{ stackhpc_release_pulp_content_url }}/centos/9-stream/storage/x86_64/ceph-reef/{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version }}"
+    distribution_name: "centos-stream-9-ceph-reef-"
+    base_path: "centos/9-stream/storage/x86_64/ceph-reef/"
     required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
 
   # EPEL 9 repository
diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml
index 843febf46..f7f30eb7a 100644
--- a/etc/kayobe/stackhpc.yml
+++ b/etc/kayobe/stackhpc.yml
@@ -76,9 +76,9 @@ stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_repo_distr
 stackhpc_repo_centos_stream_9_opstools_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/opstools/x86_64/collectd-5/{{ stackhpc_repo_centos_stream_9_opstools_version }}"
 stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_repo_distribution }}"
 
-# CentOS Stream 9 - Ceph Quincy
-stackhpc_repo_centos_stream_9_storage_ceph_quincy_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/storage/x86_64/ceph-quincy/{{ stackhpc_repo_centos_stream_9_storage_ceph_quincy_version }}"
-stackhpc_repo_centos_stream_9_storage_ceph_quincy_version: "{{ stackhpc_repo_distribution }}"
+# CentOS Stream 9 - Ceph Reef
+stackhpc_repo_centos_stream_9_storage_ceph_reef_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/storage/x86_64/ceph-reef/{{ stackhpc_repo_centos_stream_9_storage_ceph_reef_version }}"
+stackhpc_repo_centos_stream_9_storage_ceph_reef_version: "{{ stackhpc_repo_distribution }}"
 
 # CentOS Stream 9 Docker CE
 stackhpc_repo_centos_stream_9_docker_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/docker-ce/centos/9/x86_64/stable/{{ stackhpc_repo_centos_stream_9_docker_version }}"

From dc9200b6917ea6fada8d28a82e1b0fdc93d5b601 Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Thu, 25 Jul 2024 15:14:25 +0100
Subject: [PATCH 14/25] Remove horizon stackhpc fork source

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

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index c058fc4d6..91708a367 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -121,10 +121,6 @@ kolla_sources:
     type: git
     location: https://github.com/stackhpc/cloudkitty.git
     reference: stackhpc/{{ openstack_release }}
-  horizon:
-    type: git
-    location: https://github.com/stackhpc/horizon.git
-    reference: stackhpc/{{ openstack_release }}
   horizon-plugin-cloudkitty-dashboard:
     type: git
     location: https://github.com/stackhpc/cloudkitty-dashboard.git

From 52a9a78bf85e8549da7cf47f6a122fba825cec67 Mon Sep 17 00:00:00 2001
From: Alex-Welsh <alex@stackhpc.com>
Date: Thu, 22 Aug 2024 16:47:40 +0100
Subject: [PATCH 15/25] Fix broken package repo versions

---
 etc/kayobe/pulp-repo-versions.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml
index 79ca6db75..1ee47667f 100644
--- a/etc/kayobe/pulp-repo-versions.yml
+++ b/etc/kayobe/pulp-repo-versions.yml
@@ -5,7 +5,7 @@ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20240710T002922
 stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version: 20240718T001130
 stackhpc_pulp_repo_centos_stream_9_opstools_version: 20231213T031318
 stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version: 20240502T000614
-stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version: 20231020T014922
+stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version: 20240122T172142
 stackhpc_pulp_repo_elrepo_9_version: 20240214T143520
 stackhpc_pulp_repo_epel_9_version: 20240711T091318
 stackhpc_pulp_repo_grafana_version: 20240711T091318
@@ -40,6 +40,7 @@ stackhpc_pulp_repo_rocky_9_4_baseos_version: 20240707T011413
 stackhpc_pulp_repo_rocky_9_4_crb_version: 20240702T000233
 stackhpc_pulp_repo_rocky_9_4_extras_version: 20240707T235817
 stackhpc_pulp_repo_rocky_9_4_highavailability_version: 20240629T235004
+stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20240708T235303
 stackhpc_pulp_repo_ubuntu_jammy_version: 20240712T032006
 stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20240712T074902
 stackhpc_pulp_repo_ubuntu_jammy_security_version: 20240712T032006

From 271e3285bcd9b5f06e2b4a726970df1faedafdc2 Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Wed, 28 Aug 2024 10:11:28 +0100
Subject: [PATCH 16/25] Update version of RL9 third-party repos

Update threasuredata from 4 to 5
Update mariadb from 10.6 to 10.11
---
 etc/kayobe/kolla.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 1428c819f..b081e417f 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -130,7 +130,6 @@ kolla_sources:
     type: git
     location: https://github.com/stackhpc/stackhpc-inspector-plugins.git
     reference: 1.3.0
-  # Not yet merged: https://github.com/stackhpc/magnum/pull/139
   magnum-base:
     type: git
     location: https://github.com/stackhpc/magnum.git
@@ -186,10 +185,10 @@ stackhpc_rocky_9_third_party_repos:
   - url: "{{ stackhpc_repo_grafana_url }}"
     file: "grafana.repo"
     tag: "grafana"
-  - url: "{{ stackhpc_repo_rhel_9_treasuredata_4_url }}"
+  - url: "{{ stackhpc_repo_rhel_9_treasuredata_5_url }}"
     file: "td.repo"
     tag: "treasuredata"
-  - url: "{{ stackhpc_repo_rhel_9_mariadb_10_6_url }}"
+  - url: "{{ stackhpc_repo_rhel_9_mariadb_10_11_url }}"
     file: "mariadb.repo"
     tag: "mariadb"
   - url: "{{ stackhpc_repo_rhel_9_influxdb_url }}"

From 901f67f7a45a6008fb545eea13b4a7e7fe73ce85 Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Wed, 28 Aug 2024 10:12:47 +0100
Subject: [PATCH 17/25] Explicitly set version of prometheus version

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

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index b081e417f..37b2b61c1 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -146,6 +146,16 @@ kolla_sources:
     type: git
     location: https://github.com/stackhpc/ovn-octavia-provider.git
     reference: stackhpc/{{ openstack_release }}
+  prometheus-memcached-exporter:
+    version: 0.14.4
+    sha256:
+      amd64: 60b0fb90e55937869e2a7aa1310d148d56a28639ca3373e0c50548ff8eebaaa1
+      arm64: 053c6020bb2321d301bb1d43fbfc5aec64c3104a45a94338b4ca9351fc9ee014
+  prometheus-v2-server:
+    version: 2.53.1
+    sha256:
+      amd64: 2234aa0f66d9f9b854144f6faaaed72a316df7a680d9dad7cb48e49a6fa5332c
+      arm64: a7f28c83c3c943b953a9d00860bd3f2422464fb7c27a3c4037ef1ce2a41592b5
 
 ###############################################################################
 # Kolla image build configuration.

From ecf165909ef27633696b9644c6b6d4f2827d3ab2 Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Thu, 29 Aug 2024 08:34:57 +0100
Subject: [PATCH 18/25] Add missing requirements option

---
 .github/workflows/stackhpc-container-image-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/stackhpc-container-image-build.yml b/.github/workflows/stackhpc-container-image-build.yml
index 7f301962a..e8d83492f 100644
--- a/.github/workflows/stackhpc-container-image-build.yml
+++ b/.github/workflows/stackhpc-container-image-build.yml
@@ -139,14 +139,14 @@ jobs:
           python3 -m venv kayobe &&
           source kayobe/bin/activate &&
           pip install -U pip &&
-          pip install ../src/kayobe-config/requirements.txt
+          pip install -r ../src/kayobe-config/requirements.txt
 
       # Required for Pulp auth proxy deployment and Docker registry login.
       # Normally installed during host configure.
       - name: Install Docker Python SDK
         run: |
           sudo pip install docker 'requests<2.32.0'
-      
+
       - name: Get Kolla tag
         id: write-kolla-tag
         run: echo "kolla-tag=${{ needs.generate-tag.outputs.openstack_release }}-${{ matrix.distro }}-${{ matrix.distro == 'rocky' && '9' || 'jammy' }}-${{ needs.generate-tag.outputs.datetime_tag }}"  >> $GITHUB_OUTPUT

From e8aec31b9461075bd8c203b3b5c0100e470694ae Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Fri, 30 Aug 2024 12:47:55 +0100
Subject: [PATCH 19/25] Update rpm repos to match Caracal

---
 .../environments/ci-aio/stackhpc-ci.yml       |  4 +--
 .../environments/ci-builder/stackhpc-ci.yml   |  4 +--
 .../environments/ci-multinode/stackhpc-ci.yml |  4 +--
 etc/kayobe/pulp.yml                           | 32 +++++++++----------
 etc/kayobe/stackhpc.yml                       | 16 +++++-----
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/etc/kayobe/environments/ci-aio/stackhpc-ci.yml b/etc/kayobe/environments/ci-aio/stackhpc-ci.yml
index f196d9e5e..6548ca1a4 100644
--- a/etc/kayobe/environments/ci-aio/stackhpc-ci.yml
+++ b/etc/kayobe/environments/ci-aio/stackhpc-ci.yml
@@ -38,8 +38,8 @@ stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_
 stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
 stackhpc_repo_centos_stream_9_storage_ceph_reef_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version }}"
 stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
-stackhpc_repo_rhel_9_treasuredata_4_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_4_version }}"
-stackhpc_repo_rhel_9_mariadb_10_6_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_6_version }}"
+stackhpc_repo_rhel_9_treasuredata_5_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_5_version }}"
+stackhpc_repo_rhel_9_mariadb_10_11_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_11_version }}"
 stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_pulp_repo_rhel_9_influxdb_version }}"
 stackhpc_repo_epel_9_version: "{{ stackhpc_pulp_repo_epel_9_version }}"
 stackhpc_repo_opensearch_2_x_version: "{{ stackhpc_pulp_repo_opensearch_2_x_version }}"
diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
index 997473fe6..967843cb6 100644
--- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
+++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
@@ -58,8 +58,8 @@ stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_
 stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
 stackhpc_repo_centos_stream_9_storage_ceph_reef_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version }}"
 stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
-stackhpc_repo_rhel_9_treasuredata_4_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_4_version }}"
-stackhpc_repo_rhel_9_mariadb_10_6_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_6_version }}"
+stackhpc_repo_rhel_9_treasuredata_5_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_5_version }}"
+stackhpc_repo_rhel_9_mariadb_10_11_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_11_version }}"
 stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_pulp_repo_rhel_9_influxdb_version }}"
 stackhpc_repo_epel_9_version: "{{ stackhpc_pulp_repo_epel_9_version }}"
 stackhpc_repo_opensearch_2_x_version: "{{ stackhpc_pulp_repo_opensearch_2_x_version }}"
diff --git a/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml b/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml
index 77644582c..d41d2a9ef 100644
--- a/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml
+++ b/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml
@@ -35,8 +35,8 @@ stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_
 stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
 stackhpc_repo_centos_stream_9_storage_ceph_reef_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version }}"
 stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
-stackhpc_repo_rhel_9_treasuredata_4_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_4_version }}"
-stackhpc_repo_rhel_9_mariadb_10_6_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_6_version }}"
+stackhpc_repo_rhel_9_treasuredata_5_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_5_version }}"
+stackhpc_repo_rhel_9_mariadb_10_11_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_11_version }}"
 stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_pulp_repo_rhel_9_influxdb_version }}"
 stackhpc_repo_epel_9_version: "{{ stackhpc_pulp_repo_epel_9_version }}"
 stackhpc_repo_opensearch_2_x_version: "{{ stackhpc_pulp_repo_opensearch_2_x_version }}"
diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml
index ee599d8aa..82e0f79a4 100644
--- a/etc/kayobe/pulp.yml
+++ b/etc/kayobe/pulp.yml
@@ -237,16 +237,16 @@ stackhpc_pulp_rpm_repos:
     base_path: "grafana/oss/rpm/"
     required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
 
-  - name: RabbitMQ - Erlang
-    url: "{{ stackhpc_release_pulp_content_url }}/rabbitmq/erlang/el/8/x86_64/{{ stackhpc_pulp_repo_rabbitmq_erlang_version }}"
-    distribution_name: "rabbitmq-erlang-"
-    base_path: "rabbitmq/erlang/el/8/x86_64/"
+  - name: RabbitMQ - Erlang - RHEL 9
+    url: "{{ stackhpc_release_pulp_content_url }}/rabbitmq/erlang/el/9/x86_64/{{ stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version }}"
+    distribution_name: "rhel9-rabbitmq-erlang-"
+    base_path: "rabbitmq/erlang/el/9/x86_64/"
     required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
 
-  - name: RabbitMQ - Server
-    url: "{{ stackhpc_release_pulp_content_url }}/rabbitmq/rabbitmq-server/el/8/x86_64/{{ stackhpc_pulp_repo_rabbitmq_server_version }}"
-    distribution_name: "rabbitmq-server-"
-    base_path: "rabbitmq/rabbitmq-server/el/8/x86_64/"
+  - name: RabbitMQ - Server - RHEL 9
+    url: "{{ stackhpc_release_pulp_content_url }}/rabbitmq/rabbitmq-server/el/9/x86_64/{{ stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
+    distribution_name: "rhel9-rabbitmq-server-"
+    base_path: "rabbitmq/rabbitmq-server/el/9/x86_64/"
     required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
 
   # Base Rocky 9 repositories
@@ -335,16 +335,16 @@ stackhpc_pulp_rpm_repos:
     required: "{{ stackhpc_pulp_sync_el_9 | bool }}"
 
   # Additional RHEL 9 repositories
-  - name: TreasureData 4 for RHEL 9
-    url: "{{ stackhpc_release_pulp_content_url }}/treasuredata/4/redhat/9/x86_64/{{ stackhpc_pulp_repo_rhel_9_treasuredata_4_version }}"
-    distribution_name: "rhel-9-treasuredata-4-"
-    base_path: "treasuredata/4/redhat/9/x86_64/"
+  - name: TreasureData 5 for RHEL 9
+    url: "{{ stackhpc_release_pulp_content_url }}/treasuredata/4/redhat/9/x86_64/{{ stackhpc_pulp_repo_rhel_9_treasuredata_5_version }}"
+    distribution_name: "rhel-9-treasuredata-5-"
+    base_path: "treasuredata/5/redhat/9/x86_64/"
     required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
 
-  - name: MariaDB 10.6 for RHEL 9
-    url: "{{ stackhpc_release_pulp_content_url }}/mariadb-10.6/yum/rhel/9/x86_64/{{ stackhpc_pulp_repo_rhel_9_mariadb_10_6_version }}"
-    distribution_name: "rhel-9-mariadb-10-6-"
-    base_path: "mariadb-10.6/yum/rhel/9/x86_64/"
+  - name: MariaDB 10.11 for RHEL 9
+    url: "{{ stackhpc_release_pulp_content_url }}/mariadb-10.11/yum/rhel/9/x86_64/{{ stackhpc_pulp_repo_rhel_9_mariadb_10_11_version }}"
+    distribution_name: "rhel-9-mariadb-10-11-"
+    base_path: "mariadb-10.11/yum/rhel/9/x86_64/"
     required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
 
   - name: InfluxDB for RHEL 9
diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml
index 051204b96..42352698d 100644
--- a/etc/kayobe/stackhpc.yml
+++ b/etc/kayobe/stackhpc.yml
@@ -56,12 +56,12 @@ stackhpc_repo_docker_ce_ubuntu_jammy_version: "{{ stackhpc_repo_distribution }}"
 stackhpc_repo_grafana_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/grafana/oss/rpm/{{ stackhpc_repo_grafana_version }}"
 stackhpc_repo_grafana_version: "{{ stackhpc_repo_distribution }}"
 
-# RabbitMQ - Erlang for Redhat family, version 8/9 agnostic
-stackhpc_repo_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang/el/8/x86_64/{{ stackhpc_repo_rabbitmq_erlang_version }}"
+# RabbitMQ - Erlang for RHEL 9
+stackhpc_repo_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang/el/9/x86_64/{{ stackhpc_repo_rhel9_rabbitmq_erlang_version }}"
 stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_repo_distribution }}"
 
-# RabbitMQ for Redhat family, version 8/9 agnostic
-stackhpc_repo_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/8/x86_64/{{ stackhpc_repo_rabbitmq_server_version }}"
+# RabbitMQ for RHEL 9
+stackhpc_repo_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/9/x86_64/{{ stackhpc_repo_rhel9_rabbitmq_server_version }}"
 stackhpc_repo_rabbitmq_server_version: "{{ stackhpc_repo_distribution }}"
 
 # CentOS Stream 9 - NFV OpenvSwitch
@@ -85,12 +85,12 @@ stackhpc_repo_centos_stream_9_docker_url: "{{ stackhpc_repo_mirror_url }}/pulp/c
 stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_repo_distribution }}"
 
 # TreasureData 4 for RHEL 9
-stackhpc_repo_rhel_9_treasuredata_4_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/treasuredata/4/redhat/9/x86_64/{{ stackhpc_repo_rhel_9_treasuredata_4_version }}"
-stackhpc_repo_rhel_9_treasuredata_4_version: "{{ stackhpc_repo_distribution }}"
+stackhpc_repo_rhel_9_treasuredata_5_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/treasuredata/5/redhat/9/x86_64/{{ stackhpc_repo_rhel_9_treasuredata_5_version }}"
+stackhpc_repo_rhel_9_treasuredata_5_version: "{{ stackhpc_repo_distribution }}"
 
 # MariaDB 10.6 for RHEL 9
-stackhpc_repo_rhel_9_mariadb_10_6_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/mariadb-10.6/yum/rhel/9/x86_64/{{ stackhpc_repo_rhel_9_mariadb_10_6_version }}"
-stackhpc_repo_rhel_9_mariadb_10_6_version: "{{ stackhpc_repo_distribution }}"
+stackhpc_repo_rhel_9_mariadb_10_11_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/mariadb-10.6/yum/rhel/9/x86_64/{{ stackhpc_repo_rhel_9_mariadb_10_11_version }}"
+stackhpc_repo_rhel_9_mariadb_10_11_version: "{{ stackhpc_repo_distribution }}"
 
 # InfluxDB for RHEL 9
 stackhpc_repo_rhel_9_influxdb_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/influxdb/rhel/9/x86_64/stable/{{ stackhpc_repo_rhel_9_influxdb_version }}"

From 92f04a72886f781eaa8619d2d8c03c00f26aef71 Mon Sep 17 00:00:00 2001
From: Alex-Welsh <alex@stackhpc.com>
Date: Mon, 2 Sep 2024 16:28:49 +0100
Subject: [PATCH 20/25] Fix RabbitMQ repo naming

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

diff --git a/etc/kayobe/environments/ci-aio/stackhpc-ci.yml b/etc/kayobe/environments/ci-aio/stackhpc-ci.yml
index 6548ca1a4..6fd983c04 100644
--- a/etc/kayobe/environments/ci-aio/stackhpc-ci.yml
+++ b/etc/kayobe/environments/ci-aio/stackhpc-ci.yml
@@ -26,8 +26,8 @@ stackhpc_repo_mirror_password: !vault |
 
 # Build against released Pulp repository versions.
 stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_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_rhel9_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version }}"
+stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
 stackhpc_repo_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_version }}"
 stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_security_version }}"
 stackhpc_repo_ubuntu_jammy_cve_2024_6387_version: ""
diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
index 967843cb6..9587019bd 100644
--- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
+++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
@@ -46,8 +46,8 @@ stackhpc_repo_mirror_password: !vault |
 
 # Build against released Pulp repository versions.
 stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_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_rhel9_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version }}"
+stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
 stackhpc_repo_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_version }}"
 stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_security_version }}"
 stackhpc_repo_ubuntu_jammy_cve_2024_6387_version: ""
diff --git a/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml b/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml
index d41d2a9ef..e75b7589b 100644
--- a/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml
+++ b/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml
@@ -23,8 +23,8 @@ stackhpc_repo_mirror_password: !vault |
 
 # Build and deploy released Pulp repository versions.
 stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_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_rhel9_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version }}"
+stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
 stackhpc_repo_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_version }}"
 stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_security_version }}"
 stackhpc_repo_ubuntu_jammy_cve_2024_6387_version: ""
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 37b2b61c1..4d4e562e4 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -207,10 +207,10 @@ stackhpc_rocky_9_third_party_repos:
   - url: "{{ stackhpc_repo_centos_stream_9_storage_ceph_reef_url }}"
     file: "CentOS-Ceph-Reef.repo"
     tag: "centos-ceph-reef"
-  - url: "{{ stackhpc_repo_rabbitmq_erlang_url }}"
+  - url: "{{ stackhpc_repo_rhel9_rabbitmq_erlang_url }}"
     file: "rabbitmq_rabbitmq-erlang.repo"
     tag: "rabbitmq_rabbitmq-erlang"
-  - url: "{{ stackhpc_repo_rabbitmq_server_url }}"
+  - url: "{{ stackhpc_repo_rhel9_rabbitmq_server_url }}"
     file: "rabbitmq_rabbitmq-server.repo"
     tag: "rabbitmq_rabbitmq-server"
   - url: "{{ stackhpc_repo_opensearch_2_x_url }}"
diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml
index 1ee47667f..e9279c3d9 100644
--- a/etc/kayobe/pulp-repo-versions.yml
+++ b/etc/kayobe/pulp-repo-versions.yml
@@ -11,8 +11,8 @@ stackhpc_pulp_repo_epel_9_version: 20240711T091318
 stackhpc_pulp_repo_grafana_version: 20240711T091318
 stackhpc_pulp_repo_opensearch_2_x_version: 20240626T000533
 stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20240626T000533
-stackhpc_pulp_repo_rabbitmq_erlang_version: 20240711T091318
-stackhpc_pulp_repo_rabbitmq_server_version: 20240704T001154
+stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20240711T091318
+stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20240829T093746
 stackhpc_pulp_repo_rhel_9_rabbitmq_erlang_version: 20240711T091318
 stackhpc_pulp_repo_rhel_9_rabbitmq_server_version: 20240711T091318
 stackhpc_pulp_repo_rhel_9_influxdb_version: 20240702T000233
diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml
index 42352698d..25051a1e0 100644
--- a/etc/kayobe/stackhpc.yml
+++ b/etc/kayobe/stackhpc.yml
@@ -57,12 +57,12 @@ stackhpc_repo_grafana_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/grafana/
 stackhpc_repo_grafana_version: "{{ stackhpc_repo_distribution }}"
 
 # RabbitMQ - Erlang for RHEL 9
-stackhpc_repo_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang/el/9/x86_64/{{ stackhpc_repo_rhel9_rabbitmq_erlang_version }}"
-stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_repo_distribution }}"
+stackhpc_repo_rhel9_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang/el/9/x86_64/{{ stackhpc_repo_rhel9_rabbitmq_erlang_version }}"
+stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_repo_distribution }}"
 
 # RabbitMQ for RHEL 9
-stackhpc_repo_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/9/x86_64/{{ stackhpc_repo_rhel9_rabbitmq_server_version }}"
-stackhpc_repo_rabbitmq_server_version: "{{ stackhpc_repo_distribution }}"
+stackhpc_repo_rhel9_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/9/x86_64/{{ stackhpc_repo_rhel9_rabbitmq_server_version }}"
+stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_repo_distribution }}"
 
 # CentOS Stream 9 - NFV OpenvSwitch
 stackhpc_repo_centos_stream_9_nfv_openvswitch_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/nfv/x86_64/openvswitch-2/{{ stackhpc_repo_centos_stream_9_nfv_openvswitch_version }}"

From 9311875329d46539722449187b7a0cfb21ea0089 Mon Sep 17 00:00:00 2001
From: Alex-Welsh <alex@stackhpc.com>
Date: Mon, 2 Sep 2024 18:48:48 +0100
Subject: [PATCH 21/25] Fixup Caracal Kolla config

---
 etc/kayobe/pulp-repo-versions.yml | 2 --
 etc/kayobe/stackhpc.yml           | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml
index e9279c3d9..97ecbe721 100644
--- a/etc/kayobe/pulp-repo-versions.yml
+++ b/etc/kayobe/pulp-repo-versions.yml
@@ -16,9 +16,7 @@ stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20240829T093746
 stackhpc_pulp_repo_rhel_9_rabbitmq_erlang_version: 20240711T091318
 stackhpc_pulp_repo_rhel_9_rabbitmq_server_version: 20240711T091318
 stackhpc_pulp_repo_rhel_9_influxdb_version: 20240702T000233
-stackhpc_pulp_repo_rhel_9_mariadb_10_6_version: 20240517T012522
 stackhpc_pulp_repo_rhel_9_mariadb_10_11_version: 20240711T091318
-stackhpc_pulp_repo_rhel_9_treasuredata_4_version: 20231130T012511
 stackhpc_pulp_repo_rhel_9_treasuredata_5_version: 20240711T091318
 stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231207T013715
 stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231206T014015
diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml
index 25051a1e0..c8ce513d5 100644
--- a/etc/kayobe/stackhpc.yml
+++ b/etc/kayobe/stackhpc.yml
@@ -84,12 +84,12 @@ stackhpc_repo_centos_stream_9_storage_ceph_reef_version: "{{ stackhpc_repo_distr
 stackhpc_repo_centos_stream_9_docker_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/docker-ce/centos/9/x86_64/stable/{{ stackhpc_repo_centos_stream_9_docker_version }}"
 stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_repo_distribution }}"
 
-# TreasureData 4 for RHEL 9
+# TreasureData 5 for RHEL 9
 stackhpc_repo_rhel_9_treasuredata_5_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/treasuredata/5/redhat/9/x86_64/{{ stackhpc_repo_rhel_9_treasuredata_5_version }}"
 stackhpc_repo_rhel_9_treasuredata_5_version: "{{ stackhpc_repo_distribution }}"
 
-# MariaDB 10.6 for RHEL 9
-stackhpc_repo_rhel_9_mariadb_10_11_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/mariadb-10.6/yum/rhel/9/x86_64/{{ stackhpc_repo_rhel_9_mariadb_10_11_version }}"
+# MariaDB 10.11 for RHEL 9
+stackhpc_repo_rhel_9_mariadb_10_11_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/mariadb-10.11/yum/rhel/9/x86_64/{{ stackhpc_repo_rhel_9_mariadb_10_11_version }}"
 stackhpc_repo_rhel_9_mariadb_10_11_version: "{{ stackhpc_repo_distribution }}"
 
 # InfluxDB for RHEL 9

From 9c34f566dbb60c7a9ab0c4bf82ae1c13a46adb90 Mon Sep 17 00:00:00 2001
From: Alex-Welsh <alex@stackhpc.com>
Date: Mon, 2 Sep 2024 19:22:27 +0100
Subject: [PATCH 22/25] Bump pulp repo versions

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

diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml
index 97ecbe721..def498c38 100644
--- a/etc/kayobe/pulp-repo-versions.yml
+++ b/etc/kayobe/pulp-repo-versions.yml
@@ -1,22 +1,22 @@
 ---
 # Do not edit! This file is autogenerated by Ansible.
-stackhpc_pulp_repo_centos_stream_9_docker_version: 20240702T000233
-stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20240710T002922
-stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version: 20240718T001130
+stackhpc_pulp_repo_centos_stream_9_docker_version: 20240829T093746
+stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20240829T093746
+stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version: 20240902T080424
 stackhpc_pulp_repo_centos_stream_9_opstools_version: 20231213T031318
 stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version: 20240502T000614
-stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version: 20240122T172142
-stackhpc_pulp_repo_elrepo_9_version: 20240214T143520
-stackhpc_pulp_repo_epel_9_version: 20240711T091318
-stackhpc_pulp_repo_grafana_version: 20240711T091318
-stackhpc_pulp_repo_opensearch_2_x_version: 20240626T000533
-stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20240626T000533
+stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version: 20240829T093746
+stackhpc_pulp_repo_elrepo_9_version: 20240902T122220
+stackhpc_pulp_repo_epel_9_version: 20240902T080424
+stackhpc_pulp_repo_grafana_version: 20240902T080424
+stackhpc_pulp_repo_opensearch_2_x_version: 20240807T235120
+stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20240807T235120
 stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20240711T091318
 stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20240829T093746
+stackhpc_pulp_repo_rhel_9_influxdb_version: 20240817T001913
+stackhpc_pulp_repo_rhel_9_mariadb_10_11_version: 20240810T001640
 stackhpc_pulp_repo_rhel_9_rabbitmq_erlang_version: 20240711T091318
 stackhpc_pulp_repo_rhel_9_rabbitmq_server_version: 20240711T091318
-stackhpc_pulp_repo_rhel_9_influxdb_version: 20240702T000233
-stackhpc_pulp_repo_rhel_9_mariadb_10_11_version: 20240711T091318
 stackhpc_pulp_repo_rhel_9_treasuredata_5_version: 20240711T091318
 stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231207T013715
 stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231206T014015
@@ -33,12 +33,12 @@ stackhpc_pulp_repo_rocky_9_3_baseos_version: 20240509T005935
 stackhpc_pulp_repo_rocky_9_3_crb_version: 20240429T003818
 stackhpc_pulp_repo_rocky_9_3_extras_version: 20240506T000343
 stackhpc_pulp_repo_rocky_9_3_highavailability_version: 20240510T001129
-stackhpc_pulp_repo_rocky_9_4_appstream_version: 20240704T001154
-stackhpc_pulp_repo_rocky_9_4_baseos_version: 20240707T011413
-stackhpc_pulp_repo_rocky_9_4_crb_version: 20240702T000233
-stackhpc_pulp_repo_rocky_9_4_extras_version: 20240707T235817
-stackhpc_pulp_repo_rocky_9_4_highavailability_version: 20240629T235004
-stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20240708T235303
-stackhpc_pulp_repo_ubuntu_jammy_version: 20240712T032006
-stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20240712T074902
-stackhpc_pulp_repo_ubuntu_jammy_security_version: 20240712T032006
+stackhpc_pulp_repo_rocky_9_4_appstream_version: 20240816T002610
+stackhpc_pulp_repo_rocky_9_4_baseos_version: 20240816T002610
+stackhpc_pulp_repo_rocky_9_4_crb_version: 20240816T002610
+stackhpc_pulp_repo_rocky_9_4_extras_version: 20240816T002610
+stackhpc_pulp_repo_rocky_9_4_highavailability_version: 20240816T002610
+stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20240718T001130
+stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20240902T130724
+stackhpc_pulp_repo_ubuntu_jammy_security_version: 20240901T094519
+stackhpc_pulp_repo_ubuntu_jammy_version: 20240901T094519
\ No newline at end of file

From 98dde41387489f5f1caa0afeb4f573d0886ef69d Mon Sep 17 00:00:00 2001
From: Alex-Welsh <alex@stackhpc.com>
Date: Tue, 3 Sep 2024 09:37:17 +0100
Subject: [PATCH 23/25] Build OVN Octavia provider from upstream

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

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 4d4e562e4..6ab35f02a 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -138,14 +138,6 @@ kolla_sources:
     type: git
     location: https://github.com/stackhpc/networking-generic-switch.git
     reference: stackhpc/{{ openstack_release }}
-  octavia-api-plugin-ovn-octavia-provider:
-    type: git
-    location: https://github.com/stackhpc/ovn-octavia-provider.git
-    reference: stackhpc/{{ openstack_release }}
-  octavia-driver-agent-plugin-ovn-octavia-provider:
-    type: git
-    location: https://github.com/stackhpc/ovn-octavia-provider.git
-    reference: stackhpc/{{ openstack_release }}
   prometheus-memcached-exporter:
     version: 0.14.4
     sha256:

From 20f63d357823d1ae838857d5fb4df9f022d937a9 Mon Sep 17 00:00:00 2001
From: Alex-Welsh <alex@stackhpc.com>
Date: Mon, 9 Sep 2024 10:06:52 +0100
Subject: [PATCH 24/25] Revert "Explicitly set version of prometheus version"

This reverts commit 901f67f7a45a6008fb545eea13b4a7e7fe73ce85.
---
 etc/kayobe/kolla.yml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 6ab35f02a..b89b8513d 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -138,16 +138,6 @@ kolla_sources:
     type: git
     location: https://github.com/stackhpc/networking-generic-switch.git
     reference: stackhpc/{{ openstack_release }}
-  prometheus-memcached-exporter:
-    version: 0.14.4
-    sha256:
-      amd64: 60b0fb90e55937869e2a7aa1310d148d56a28639ca3373e0c50548ff8eebaaa1
-      arm64: 053c6020bb2321d301bb1d43fbfc5aec64c3104a45a94338b4ca9351fc9ee014
-  prometheus-v2-server:
-    version: 2.53.1
-    sha256:
-      amd64: 2234aa0f66d9f9b854144f6faaaed72a316df7a680d9dad7cb48e49a6fa5332c
-      arm64: a7f28c83c3c943b953a9d00860bd3f2422464fb7c27a3c4037ef1ce2a41592b5
 
 ###############################################################################
 # Kolla image build configuration.

From 3327476d4ab8a9defb95edf0ecd2ff2600402ac9 Mon Sep 17 00:00:00 2001
From: Alex-Welsh <alex@stackhpc.com>
Date: Mon, 9 Sep 2024 10:08:51 +0100
Subject: [PATCH 25/25] Pulp repo versions eof newline

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

diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml
index def498c38..67999a8a7 100644
--- a/etc/kayobe/pulp-repo-versions.yml
+++ b/etc/kayobe/pulp-repo-versions.yml
@@ -41,4 +41,4 @@ stackhpc_pulp_repo_rocky_9_4_highavailability_version: 20240816T002610
 stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20240718T001130
 stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20240902T130724
 stackhpc_pulp_repo_ubuntu_jammy_security_version: 20240901T094519
-stackhpc_pulp_repo_ubuntu_jammy_version: 20240901T094519
\ No newline at end of file
+stackhpc_pulp_repo_ubuntu_jammy_version: 20240901T094519