From 643b257ab5aab65d1c9af180c1d27169b3489695 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Mon, 21 Jul 2025 15:51:13 +0100 Subject: [PATCH 1/9] Bump RHEL9 rabbitmq repos Change-Id: I02de3fa8858c0fd9cc6c4ecd0024ea710e45894a --- etc/kayobe/pulp-repo-versions.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index 6264f8df5..87b557447 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -21,15 +21,13 @@ stackhpc_pulp_repo_epel_9_aarch64_version: 20250615T015805 stackhpc_pulp_repo_grafana_version: 20250615T005738 stackhpc_pulp_repo_opensearch_2_x_version: 20250430T014638 stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20250430T014638 -stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20241217T002152 -stackhpc_pulp_repo_rhel9_rabbitmq_erlang_aarch64_version: 20241213T015928 -stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20241217T002152 +stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20250718T004955 +stackhpc_pulp_repo_rhel9_rabbitmq_erlang_aarch64_version: 20250721T162732 +stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20250708T003546 stackhpc_pulp_repo_rhel_9_influxdb_version: 20241217T002152 stackhpc_pulp_repo_rhel_9_influxdb_aarch64_version: 20241217T012754 stackhpc_pulp_repo_rhel_9_mariadb_10_11_version: 20241102T004913 stackhpc_pulp_repo_rhel_9_mariadb_10_11_aarch64_version: 20241102T015940 -stackhpc_pulp_repo_rhel_9_rabbitmq_erlang_version: 20240711T091318 -stackhpc_pulp_repo_rhel_9_rabbitmq_server_version: 20240711T091318 stackhpc_pulp_repo_rhel_9_treasuredata_5_version: 20241115T002028 stackhpc_pulp_repo_rhel_9_treasuredata_5_aarch64_version: 20241115T010217 stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231207T013715 From 6191a808d4212c6f874df07265db128aecf6d9d5 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Tue, 22 Jul 2025 10:04:04 +0100 Subject: [PATCH 2/9] Build RabbitMQ 4.1 images --- etc/kayobe/kolla-image-tags.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index bd9ecd8cb..520cbcdd6 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -50,3 +50,7 @@ kolla_image_tags: ubuntu-jammy: 2024.1-ubuntu-jammy-20250219T145255 prometheus_alertmanager: ubuntu-jammy: 2024.1-ubuntu-jammy-20250422T103147 + rabbitmq: + rocky-9: 2024.1-rocky-9-20250722T083943 + ubuntu-jammy: 2024.1-ubuntu-jammy-20250722T083943 + ubuntu-noble: 2024.1-ubuntu-noble-20250722T083943 From ae0b2f659e3d32776156f45adb8c237853532163 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Fri, 27 Jun 2025 13:40:41 +0100 Subject: [PATCH 3/9] Build kolla images with oslo.messaging 14.7.3 Only the services use RabbitMQ are rebuilt. Which are - barbican - blazar - cinder - cloudkitty - designate - heat - ironic - keystone - magnum - manila - neutron - nova - octavia --- etc/kayobe/kolla-image-tags.yml | 57 ++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 11 deletions(-) diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index 520cbcdd6..8046ac5eb 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -7,39 +7,74 @@ kolla_image_tags: rocky-9: 2024.1-rocky-9-20250716T041633 ubuntu-jammy: 2024.1-ubuntu-jammy-20241218T141809 ubuntu-noble: 2024.1-ubuntu-noble-20250404T150323 + barbican: + rocky-9: 2024.1-rocky-9-20250717T094248 + ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805 + ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805 + blazar: + rocky-9: 2024.1-rocky-9-20250627T102805 + ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805 + ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805 bifrost: ubuntu-jammy: 2024.1-ubuntu-jammy-20250325T141125 + cinder: + rocky-9: 2024.1-rocky-9-20250717T094248 + ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805 + ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805 + cloudkitty: + rocky-9: 2024.1-rocky-9-20250717T094248 + ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805 + ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805 + designate: + rocky-9: 2024.1-rocky-9-20250717T094248 + ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805 + ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805 + heat: + rocky-9: 2024.1-rocky-9-20250717T094248 + ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805 + ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805 glance: ubuntu-jammy: 2024.1-ubuntu-jammy-20250213T103134 horizon: ubuntu-jammy: 2024.1-ubuntu-jammy-20250227T091118 ironic: - ubuntu-jammy: 2024.1-ubuntu-jammy-20250213T110505 + rocky-9: 2024.1-rocky-9-20250717T094248 + ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805 + ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805 ironic_dnsmasq: ubuntu-jammy: 2024.1-ubuntu-jammy-20241218T141809 ironic_prometheus_exporter: ubuntu-jammy: 2024.1-ubuntu-jammy-20250124T081816 + keystone: + rocky-9: 2024.1-rocky-9-20250717T094248 + ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805 + ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805 kolla_toolbox: ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147 ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147 magnum: - ubuntu-jammy: 2024.1-ubuntu-jammy-20250522T143506 - ubuntu-noble: 2024.1-ubuntu-noble-20250522T143506 + rocky-9: 2024.1-rocky-9-20250717T094248 + ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805 + ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805 manila: - ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147 - ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147 + rocky-9: 2024.1-rocky-9-20250717T094248 + ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805 + ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805 neutron: - ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147 - ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147 + rocky-9: 2024.1-rocky-9-20250717T094248 + ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805 + ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805 neutron_bgp_dragent: ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147 ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147 nova: - ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147 - ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147 + rocky-9: 2024.1-rocky-9-20250717T094248 + ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805 + ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805 octavia: - ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147 - ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147 + rocky-9: 2024.1-rocky-9-20250717T094248 + ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805 + ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805 openvswitch: ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147 ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147 From 8bfdc9147fb2cd450ef938fbe92722a06bc8e305 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Tue, 22 Jul 2025 11:13:28 +0100 Subject: [PATCH 4/9] Add RabbitMQ 4.1 to stackhpc_pulp_images_kolla --- etc/kayobe/pulp.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index 1c5ec6845..90dc7d54b 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -601,6 +601,7 @@ stackhpc_pulp_images_kolla: - prometheus-openstack-exporter - prometheus-v2-server - rabbitmq + - rabbitmq-4-1 - redis - redis-sentinel From 9f438db3532c8d91b9b831f634e46732a1b056f6 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Tue, 22 Jul 2025 11:15:10 +0100 Subject: [PATCH 5/9] Add RabbitMQ upgrade to 4.1 to upgrade prerequesite --- tools/upgrade-prerequisites.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/upgrade-prerequisites.sh b/tools/upgrade-prerequisites.sh index d1a14818c..b372611f7 100755 --- a/tools/upgrade-prerequisites.sh +++ b/tools/upgrade-prerequisites.sh @@ -17,6 +17,13 @@ function prechecks() { fi } +function rabbit_upgrade() { + # Ensure RabbitMQ is upgraded to 4.1 + if kayobe overcloud host command run -l controllers -b --command "docker exec rabbitmq rabbitmqctl --version | grep -F 3.13." --show-output; then + kayobe kolla ansible run "rabbitmq-upgrade 4.1" + fi +} + function rabbit_migration() { if kayobe overcloud host command run -l controllers -b --command "docker exec rabbitmq rabbitmqctl list_queues durable | grep false"; then # Set feature flaga, execute RabbitMQ queue migration script, unset feature flags (to avoid git conflicts) @@ -43,3 +50,4 @@ function rabbit_migration() { prechecks rabbit_migration +rabbit_upgrade From 12a2a2ebcd776878550887014b245392da3f7e3c Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Wed, 23 Jul 2025 09:38:23 +0100 Subject: [PATCH 6/9] Skip rabbitmq version check before upgrading to 4.1 Currently K-A only allows 3.13 to 4.0 upgrade route but 3.13 to 4.1 is also supported. Skipping rabbitmq version check until this is fixed in K-A --- tools/upgrade-prerequisites.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/upgrade-prerequisites.sh b/tools/upgrade-prerequisites.sh index b372611f7..5c931dcff 100755 --- a/tools/upgrade-prerequisites.sh +++ b/tools/upgrade-prerequisites.sh @@ -20,7 +20,7 @@ function prechecks() { function rabbit_upgrade() { # Ensure RabbitMQ is upgraded to 4.1 if kayobe overcloud host command run -l controllers -b --command "docker exec rabbitmq rabbitmqctl --version | grep -F 3.13." --show-output; then - kayobe kolla ansible run "rabbitmq-upgrade 4.1" + kayobe kolla ansible run "rabbitmq-upgrade 4.1" --kolla-skip-tags rabbitmq-version-check fi } From 7c2a18624090ccac033a311a35f250039006717c Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Mon, 28 Jul 2025 08:46:51 +0100 Subject: [PATCH 7/9] Add omitted ironic-dnsmasq tag --- etc/kayobe/kolla-image-tags.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index 8046ac5eb..30bae1eda 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -42,7 +42,9 @@ kolla_image_tags: ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805 ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805 ironic_dnsmasq: + rocky-9: 2024.1-rocky-9-20250716T041633 ubuntu-jammy: 2024.1-ubuntu-jammy-20241218T141809 + ubuntu-noble: 2024.1-ubuntu-noble-20250404T150323 ironic_prometheus_exporter: ubuntu-jammy: 2024.1-ubuntu-jammy-20250124T081816 keystone: From 8e53a84b04305efb1016a1b3463be95fa1537750 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Tue, 29 Jul 2025 10:46:50 +0100 Subject: [PATCH 8/9] Add reno --- ...dd-rabbitmq-4-1-support-caracal-ddb7271c83b75897.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 releasenotes/notes/add-rabbitmq-4-1-support-caracal-ddb7271c83b75897.yaml diff --git a/releasenotes/notes/add-rabbitmq-4-1-support-caracal-ddb7271c83b75897.yaml b/releasenotes/notes/add-rabbitmq-4-1-support-caracal-ddb7271c83b75897.yaml new file mode 100644 index 000000000..b11bc5028 --- /dev/null +++ b/releasenotes/notes/add-rabbitmq-4-1-support-caracal-ddb7271c83b75897.yaml @@ -0,0 +1,9 @@ +--- +features: + - | + Added RabbitMQ 4.1 support to 2024.1 StackHPC Kayobe Config + + Added a step to upgrade RabbitMQ from version 3.13 to 4.1 after queue + migration in ``upgrade-prerequisites.sh``. + Multinode upgrade CI will go through this when run with major upgrade + enabled. From e76e0e4f38ccc8239d70a57f34f08e27a5a7afde Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Tue, 29 Jul 2025 12:40:41 +0200 Subject: [PATCH 9/9] Tweak reno further --- .../add-rabbitmq-4-1-support-caracal-ddb7271c83b75897.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/releasenotes/notes/add-rabbitmq-4-1-support-caracal-ddb7271c83b75897.yaml b/releasenotes/notes/add-rabbitmq-4-1-support-caracal-ddb7271c83b75897.yaml index b11bc5028..e7e8c99b8 100644 --- a/releasenotes/notes/add-rabbitmq-4-1-support-caracal-ddb7271c83b75897.yaml +++ b/releasenotes/notes/add-rabbitmq-4-1-support-caracal-ddb7271c83b75897.yaml @@ -1,8 +1,7 @@ --- features: - | - Added RabbitMQ 4.1 support to 2024.1 StackHPC Kayobe Config - + Added RabbitMQ 4.1 support. Added a step to upgrade RabbitMQ from version 3.13 to 4.1 after queue migration in ``upgrade-prerequisites.sh``. Multinode upgrade CI will go through this when run with major upgrade