From 6a2f89b19342dc7515e1f4c671a3a73ad73720c9 Mon Sep 17 00:00:00 2001
From: Will Szumski <will@stackhpc.com>
Date: Fri, 2 Feb 2024 13:38:43 +0000
Subject: [PATCH] Zed: Rebuild Rocky Images

These have been rebuilt using Rocky 9.3 snapshots.
---
 etc/kayobe/kolla/globals.yml                    | 17 ++++++-----------
 .../kolla-rocky9.3-images-a3ff235485093191.yaml |  4 ++++
 2 files changed, 10 insertions(+), 11 deletions(-)
 create mode 100644 releasenotes/notes/kolla-rocky9.3-images-a3ff235485093191.yaml

diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml
index d2e20b974..b86300e52 100644
--- a/etc/kayobe/kolla/globals.yml
+++ b/etc/kayobe/kolla/globals.yml
@@ -12,30 +12,25 @@ kolla_base_distro: "{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %
 
 kayobe_image_tags:
   openstack:
-    rocky: zed-rocky-9-20230921T153510
+    rocky: zed-rocky-9-20240202T105829
     ubuntu: zed-ubuntu-jammy-20230921T153510
   bifrost:
-    rocky: zed-rocky-9-20230927T142529
     ubuntu: zed-ubuntu-jammy-20230927T154443
   ovn:
-    rocky: zed-rocky-9-20230925T132313
     ubuntu: zed-ubuntu-jammy-20230821T155947
   cloudkitty:
-    rocky: zed-rocky-9-20231114T124701
     ubuntu: zed-ubuntu-jammy-20231114T124701
   neutron:
-    rocky: zed-rocky-9-20231115T094053
     ubuntu: zed-ubuntu-jammy-20231115T094053
   opensearch:
-    rocky: zed-rocky-9-20231214T095452
     ubuntu: zed-ubuntu-jammy-20231214T095452
 
 openstack_tag: "{% raw %}{{ kayobe_image_tags['openstack'][kolla_base_distro] }}{% endraw %}"
-bifrost_tag: "{% raw %}{{ kayobe_image_tags['bifrost'][kolla_base_distro] }}{% endraw %}"
-ovn_tag: "{% raw %}{{ kayobe_image_tags['ovn'][kolla_base_distro] }}{% endraw %}"
-cloudkitty_tag: "{% raw %}{{ kayobe_image_tags['cloudkitty'][kolla_base_distro] }}{% endraw %}"
-neutron_tag: "{% raw %}{{ kayobe_image_tags['neutron'][kolla_base_distro] }}{% endraw %}"
-opensearch_tag: "{% raw %}{{ kayobe_image_tags['opensearch'][kolla_base_distro] }}{% endraw %}"
+bifrost_tag: "{% raw %}{{ kayobe_image_tags['bifrost'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
+ovn_tag: "{% raw %}{{ kayobe_image_tags['ovn'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
+cloudkitty_tag: "{% raw %}{{ kayobe_image_tags['cloudkitty'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
+neutron_tag: "{% raw %}{{ kayobe_image_tags['neutron'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
+opensearch_tag: "{% raw %}{{ kayobe_image_tags['opensearch'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
 
 om_enable_rabbitmq_high_availability: true
 
diff --git a/releasenotes/notes/kolla-rocky9.3-images-a3ff235485093191.yaml b/releasenotes/notes/kolla-rocky9.3-images-a3ff235485093191.yaml
new file mode 100644
index 000000000..0c5e9ddcc
--- /dev/null
+++ b/releasenotes/notes/kolla-rocky9.3-images-a3ff235485093191.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Rocky images have been rebuilt and are now based on Rocky 9.3.