From 6730367716241fe829976c48d0a08ba8e9eed1fa Mon Sep 17 00:00:00 2001
From: Jake Hutchinson <jake@stackhpc.com>
Date: Wed, 13 Sep 2023 16:38:02 +0100
Subject: [PATCH 1/2] Remove kolla_build_customizations_rocky defaults

---
 .../environments/ci-builder/stackhpc-ci.yml   |  3 ++
 etc/kayobe/kolla.yml                          | 42 +------------------
 2 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
index d64d24c00..bb8e372bb 100644
--- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
+++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
@@ -89,3 +89,6 @@ stackhpc_docker_registry_password: !vault |
 # Username and password of the overcloud host image repository.
 stackhpc_image_repository_username: "{{ stackhpc_docker_registry_username }}"
 stackhpc_image_repository_password: "{{ stackhpc_docker_registry_password }}"
+
+# SELinux set to disabled mode.
+selinux_state: disabled
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 39ec0dfb9..d0e005d2e 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -277,47 +277,7 @@ kolla_build_customizations_common:
   ironic_inspector_pip_packages_append:
     - /additions/*
 
-kolla_build_customizations_rocky: # TODO: Check whether this is actually correct. It seems that it was previously being skipped for rocky
-  base_yum_repo_files_remove:
-    - proxysql.repo
-  neutron_base_packages_remove:
-    - openvswitch
-    - python3-openvswitch
-  neutron_base_packages_append:
-    - openvswitch2.17
-    - python3-openvswitch2.17
-  nova_base_packages_remove:
-    - openvswitch
-    - python3-openvswitch
-  nova_base_packages_append:
-    - openvswitch2.17
-    - python3-openvswitch2.17
-  nova_compute_packages_remove:
-    - openvswitch
-  nova_compute_packages_append:
-    - openvswitch2.17
-  octavia_base_packages_remove:
-    - openvswitch
-    - python3-openvswitch
-  octavia_base_packages_append:
-    - openvswitch2.17
-    - python3-openvswitch2.17
-  ovn_base_packages_override:
-    - ovn22.09
-  ovn_controller_packages_override:
-    - ovn22.09-host
-  ovn_nb_db_server_packages_override:
-    - ovn22.09-central
-  ovn_northd_packages_override:
-    - ovn22.09-central
-  ovn_sb_db_server_packages_override:
-    - ovn22.09-central
-  openvswitch_base_packages_remove:
-    - openvswitch
-    - python3-openvswitch
-  openvswitch_base_packages_append:
-    - openvswitch2.17
-    - python3-openvswitch2.17
+kolla_build_customizations_rocky: {}
 
 kolla_build_customizations_ubuntu: {}
 

From 7895d9a30efa04632dab63f3120e7f0aeaeddfd4 Mon Sep 17 00:00:00 2001
From: Jake Hutchinson <jake@stackhpc.com>
Date: Thu, 14 Sep 2023 10:49:13 +0100
Subject: [PATCH 2/2] Bump kolla tags

---
 .../environments/ci-builder/stackhpc-ci.yml   |  3 ---
 etc/kayobe/kolla/globals.yml                  | 20 +++++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
index bb8e372bb..d64d24c00 100644
--- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
+++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
@@ -89,6 +89,3 @@ stackhpc_docker_registry_password: !vault |
 # Username and password of the overcloud host image repository.
 stackhpc_image_repository_username: "{{ stackhpc_docker_registry_username }}"
 stackhpc_image_repository_password: "{{ stackhpc_docker_registry_password }}"
-
-# SELinux set to disabled mode.
-selinux_state: disabled
diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml
index 417a67fe0..c1715158b 100644
--- a/etc/kayobe/kolla/globals.yml
+++ b/etc/kayobe/kolla/globals.yml
@@ -14,8 +14,28 @@ kayobe_image_tags:
   openstack:
     rocky: zed-rocky-9-20230821T155947
     ubuntu: zed-ubuntu-jammy-20230821T155947
+  neutron:
+    rocky: zed-rocky-9-20230921T112227
+    ubuntu: zed-ubuntu-jammy-20230821T155947
+  nova:
+    rocky: zed-rocky-9-20230921T112227
+    ubuntu: zed-ubuntu-jammy-20230821T155947
+  octavia:
+    rocky: zed-rocky-9-20230921T112227
+    ubuntu: zed-ubuntu-jammy-20230821T155947
+  ovn:
+    rocky: zed-rocky-9-20230921T112227
+    ubuntu: zed-ubuntu-jammy-20230821T155947
+  openvswitch:
+    rocky: zed-rocky-9-20230921T112227
+    ubuntu: zed-ubuntu-jammy-20230821T155947
 
 openstack_tag: "{% raw %}{{ kayobe_image_tags['openstack'][kolla_base_distro] }}{% endraw %}"
+neutron_tag: "{% raw %}{{ kayobe_image_tags['neutron'][kolla_base_distro] }}{% endraw %}"
+nova_tag: "{% raw %}{{ kayobe_image_tags['nova'][kolla_base_distro] }}{% endraw %}"
+octavia_tag: "{% raw %}{{ kayobe_image_tags['octavia'][kolla_base_distro] }}{% endraw %}"
+ovn_tag: "{% raw %}{{ kayobe_image_tags['ovn'][kolla_base_distro] }}{% endraw %}"
+openvswitch_tag: "{% raw %}{{ kayobe_image_tags['openvswitch'][kolla_base_distro] }}{% endraw %}"
 
 om_enable_rabbitmq_high_availability: true