Merge pull request #544 from stackhpc/fix-rocky-ci

Fix Rocky CI

Author: Alex-Welsh

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/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