Merge branch 'stackhpc:stackhpc/yoga' into stackhpc/yoga

stackhpc · Jun 29, 2023 · 48fa9ca · 48fa9ca
2 parents 4009c5d + a9d8b98
commit 48fa9ca
Show file tree

Hide file tree

Showing 8 changed files with 1,028 additions and 8 deletions.
diff --git a/etc/kayobe/environments/ci-aio/inventory/group_vars/controllers/network-interfaces b/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.