Merge branch 'stackhpc/master' into sync-2024.1

Alex-Welsh · Alex-Welsh · commit 9dd0cd6991c1 · 2025-05-09T15:29:03.000+01:00
diff --git a/etc/kayobe/ansible/rabbitmq-reset.yml b/etc/kayobe/ansible/rabbitmq-reset.yml
@@ -44,7 +44,7 @@
       register: inspection
 
     - name: Ensure the {{ container_name }} container is running
-      ansible.builtin.command: systemctl start kolla-{{ container_name }}-container.service # noqa command-instead-of-module
+      ansible.builtin.command: systemctl start kolla-{{ container_name }}-container.service  # noqa command-instead-of-module
       when: inspection.stdout == 'false'
 
     - name: Wait for the {{ container_name }} container to reach state 'Running'
diff --git a/etc/kayobe/inventory/group_vars/all/openbao.yml b/etc/kayobe/inventory/group_vars/all/openbao.yml
@@ -1,3 +1,4 @@
+---
 ###############################################################################
 # Openbao deployment configuration.
 
diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml
@@ -16,6 +16,6 @@ kolla_image_tags:
   prometheus:
     rocky-9: master-rocky-9-20250430T112026
     ubuntu-noble: master-ubuntu-noble-20250430T112026
-  skyline:
-    rocky-9: master-rocky-9-20250425T091159
-    ubuntu-noble: master-ubuntu-noble-20250425T091159
+  rabbitmq:
+    rocky-9: master-rocky-9-20250502T080944
+    ubuntu-noble: master-ubuntu-noble-20250502T080944
diff --git a/releasenotes/notes/rabbitmq-4.0-52657c95567fc457.yaml b/releasenotes/notes/rabbitmq-4.0-52657c95567fc457.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Bumps the RabbitMQ container image tag to upgrade RabbitMQ to v4.0

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+---`
`1`	`2`	`###############################################################################`
`2`	`3`	`# Openbao deployment configuration.`
`3`	`4`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +---
 +features:
 +  - |
 +    Bumps the RabbitMQ container image tag to upgrade RabbitMQ to v4.0