From 0a78abfcdec81c464acf349ac5aae74ca79f7963 Mon Sep 17 00:00:00 2001
From: Alex-Welsh <alex@stackhpc.com>
Date: Tue, 26 Mar 2024 17:06:01 +0000
Subject: [PATCH] testo

---
 .github/workflows/overcloud-host-image-build.yml      |  7 +++++--
 etc/kayobe/ansible/openstack-host-image-upload.yml    |  1 +
 .../inventory/group_vars/seed/network-interfaces      | 11 +++++++++--
 etc/kayobe/overcloud-dib.yml                          |  2 +-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/overcloud-host-image-build.yml b/.github/workflows/overcloud-host-image-build.yml
index 9a3323e38..3c59013b8 100644
--- a/.github/workflows/overcloud-host-image-build.yml
+++ b/.github/workflows/overcloud-host-image-build.yml
@@ -171,9 +171,11 @@ jobs:
 
       - name: Write Terraform network interface config
         run: |
-          mkdir -p etc/kayobe/environments/$KAYOBE_ENVIRONMENT/inventory/group_vars/seed
-          cat << EOF > etc/kayobe/environments/$KAYOBE_ENVIRONMENT/inventory/group_vars/seed/tf-network-interfaces
+          mkdir -p src/kayobe-config/etc/kayobe/environments/$KAYOBE_ENVIRONMENT/inventory/group_vars/seed
+          rm -f src/kayobe-config/etc/kayobe/environments/$KAYOBE_ENVIRONMENT/inventory/group_vars/seed/network-interfaces
+          cat << EOF > src/kayobe-config/etc/kayobe/environments/$KAYOBE_ENVIRONMENT/inventory/group_vars/seed/network-interfaces
           admin_interface: "{{ access_interface.value }}"
+          aio_interface: "{{ access_interface.value }}"
           EOF
 
       - name: Manage SSH keys
@@ -234,6 +236,7 @@ jobs:
           -e stackhpc_overcloud_dib_name=overcloud-centos-8-stream
         env:
           KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
+        if: inputs.centos
 
       - name: Show last error logs
         continue-on-error: true
diff --git a/etc/kayobe/ansible/openstack-host-image-upload.yml b/etc/kayobe/ansible/openstack-host-image-upload.yml
index e39aa16c0..ff0a2f800 100644
--- a/etc/kayobe/ansible/openstack-host-image-upload.yml
+++ b/etc/kayobe/ansible/openstack-host-image-upload.yml
@@ -40,3 +40,4 @@
         disk_format: qcow2
         state: present
         filename: "{{ local_image_path }}"
+        visibility: "shared"
diff --git a/etc/kayobe/environments/ci-builder/inventory/group_vars/seed/network-interfaces b/etc/kayobe/environments/ci-builder/inventory/group_vars/seed/network-interfaces
index c143fe2c9..a583b7214 100644
--- a/etc/kayobe/environments/ci-builder/inventory/group_vars/seed/network-interfaces
+++ b/etc/kayobe/environments/ci-builder/inventory/group_vars/seed/network-interfaces
@@ -2,5 +2,12 @@
 ###############################################################################
 # Network interface definitions for the controller group.
 
-# Seed interface on all-in-one network.
-aio_interface: eth0
+# Controller interface on all-in-one network.
+aio_interface: breth1
+# Use dummy1 if it exists, otherwise the bridge will have no ports.
+aio_bridge_ports: "{{ ['dummy1'] if 'dummy1' in hostvars[inventory_hostname].ansible_facts else [] }}"
+
+###############################################################################
+# Dummy variable to allow Ansible to accept this file.
+workaround_ansible_issue_8743: yes
+
diff --git a/etc/kayobe/overcloud-dib.yml b/etc/kayobe/overcloud-dib.yml
index d7f6dbd69..ad15000f3 100644
--- a/etc/kayobe/overcloud-dib.yml
+++ b/etc/kayobe/overcloud-dib.yml
@@ -71,7 +71,7 @@ overcloud_dib_host_packages_extra:
 overcloud_dib_git_elements_extra:
   - repo: "https://github.com/stackhpc/stackhpc-image-elements"
     local: "{{ source_checkout_path }}/stackhpc-image-elements"
-    version: "v1.6.1"
+    version: "fix-rocky-containerfile"
     elements_path: "elements"
 
 # List of git repositories containing Diskimage Builder (DIB) elements. See