diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index bd9ecd8cb..30bae1eda 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -7,39 +7,76 @@ 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: + 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: + 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 @@ -50,3 +87,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 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 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 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..e7e8c99b8 --- /dev/null +++ b/releasenotes/notes/add-rabbitmq-4-1-support-caracal-ddb7271c83b75897.yaml @@ -0,0 +1,8 @@ +--- +features: + - | + 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 + enabled. diff --git a/tools/upgrade-prerequisites.sh b/tools/upgrade-prerequisites.sh index d1a14818c..5c931dcff 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" --kolla-skip-tags rabbitmq-version-check + 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