Merge remote-tracking branch 'origin/epoxy-upgrade-test' into epoxy-refresh

Author: Alex-Welsh

.github/workflows/stackhpc-multinode.yml

@@ -70,6 +70,6 @@ jobs:
       ssh_key: ${{ inputs.ssh_key }}
       stackhpc_kayobe_config_version: ${{ github.ref_name }}
       # NOTE(upgrade): Reference the PREVIOUS and CURRENT releases here.
-      stackhpc_kayobe_config_previous_version: ${{ inputs.upgrade == 'major' && 'stackhpc/2024.1' || 'stackhpc/2025.1' }}
+      stackhpc_kayobe_config_previous_version: ${{ inputs.upgrade == 'major' && 'rabbitmq-migration-ci' || 'stackhpc/2025.1' }}
       terraform_kayobe_multinode_version: ${{ inputs.terraform_kayobe_multinode_version }}
     secrets: inherit

doc/source/operations/upgrading-openstack.rst

@@ -79,7 +79,7 @@ After queue migration is finished, upgrade RabbitMQ to 4.1 by running the follow
 
 .. code-block:: bash
 
-   kayobe kolla ansible run rabbitmq-upgrade 4.1
+   kayobe kolla ansible run "rabbitmq-upgrade 4.1"
 
 .. note::
 

etc/kayobe/kolla/globals.yml

@@ -58,3 +58,5 @@ prometheus_blackbox_exporter_endpoints_kayobe:
     enabled: "{{ seed_pulp_container_enabled | bool }}"
 
 prometheus_openstack_exporter_interval: "{{ stackhpc_prometheus_openstack_exporter_interval }}s"
+
+rabbitmq_image: "{% raw %}{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/rabbitmq-4-1{% endraw %}"

etc/kayobe/pulp-repo-versions.yml

@@ -33,8 +33,6 @@ stackhpc_pulp_repo_rhel_9_influxdb_version: 20250529T023704
 stackhpc_pulp_repo_rhel_9_influxdb_aarch64_version: 20250529T041909
 stackhpc_pulp_repo_rhel_9_mariadb_10_11_version: 20250523T014203
 stackhpc_pulp_repo_rhel_9_mariadb_10_11_aarch64_version: 20250523T035924
-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: 20250516T002449
 stackhpc_pulp_repo_rhel_9_treasuredata_5_aarch64_version: 20250516T024051
 stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231207T013715

etc/kayobe/pulp.yml

@@ -564,6 +564,7 @@ stackhpc_pulp_images_kolla:
   - prometheus-server
   - proxysql
   - rabbitmq
+  - rabbitmq-4-1
   - redis
   - redis-sentinel