Fix CI for Rocky 8/9

This change includes two fixes.

The first fixes the kolla configuration for Rocky Linux 8 deployments,
which was deploying Rocky containers, rather than CentOS.

The other fixes an error in the network configuration for Rocky Linux 9
AIOs

Author: Alex-Welsh

.github/workflows/stackhpc-all-in-one.yml

@@ -243,6 +243,17 @@ jobs:
         run: |
           test $(wc -l < tempest-artifacts/failed-tests) -lt 1
 
+      - name: Run debug playbook
+        run: |
+          sudo -E docker run -t --rm \
+            -v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
+            -e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
+            $KAYOBE_IMAGE \
+            /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/debug-ci-with-ssh.yml'
+        env:
+          KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
+        if: failure()
+
       - name: Destroy
         run: terraform destroy -auto-approve
         working-directory: ${{ github.workspace }}/terraform/aio
@@ -254,5 +265,5 @@ jobs:
 
       - name: Prune Docker images over 1 week old
         # May fail if another prune is running
-        run: sudo docker image prune --all --force --filter until=168h || true
+        run: sudo docker image prune --all --force --filter until=100h || true
         if: always()

etc/kayobe/ansible/debug-ci-with-ssh.yml

@@ -0,0 +1,22 @@
+---
+# Custom playbook to add an SSH key to a CI runner for debugging
+
+- name: Ensure SSH key exists on CI runner
+  hosts: overcloud
+  gather_facts: true
+  tasks:
+    - name: Add SSH key
+      authorized_key:
+        user: stack
+        state: present
+        key: "{{ stackhpc_ci_debug_ssh_key }}"
+      when: stackhpc_ci_debug | bool
+    - name: Print debug information
+      debug:
+        msg: "You can now SSH into stack@{{ ansible_facts.default_ipv4.address }}"
+      when: stackhpc_ci_debug | bool
+
+    - name: Wait for 6h
+      wait_for:
+        timeout: 21600 # 6h
+      when: stackhpc_ci_debug | bool

etc/kayobe/environments/ci-aio/inventory/group_vars/controllers/network-interfaces

@@ -5,7 +5,7 @@
 # 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 [] }}"
+aio_bridge_ports: "{{ ['dummy1'] if ('dummy1' in hostvars[inventory_hostname].ansible_facts) or (os_distribution == 'rocky' and os_release == '9') else [] }}"
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.

etc/kayobe/environments/ci-aio/stackhpc-ci.yml

@@ -83,3 +83,7 @@ stackhpc_docker_registry_password: !vault |
   38333133393730633666613965653364316162353337313330346164303631313731646461363461
   3963323635373866630a633533376339363734626664333765313665623662613764363038383735
   38646138376438643533376161376634653439386230353365316239613430363338
+
+# Debug options for CI
+stackhpc_ci_debug: true
+stackhpc_ci_debug_ssh_key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPnD+FZSMIEPXHWEXXYWWCTyBlKcoWCpy7Xrm8fB6pT3"

etc/kayobe/kolla/globals.yml

@@ -6,8 +6,6 @@
 # non-overcloud hosts
 enable_docker_repo: "{% raw %}{{ 'overcloud' not in group_names or ansible_facts.os_family == 'Debian' }}{% endraw %}"
 
-kolla_base_distro: "{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %}"
-
 neutron_tag: yoga-20230515T150233
 nova_tag: yoga-20230518T105834
 octavia_tag: yoga-20230523T110936