Update ci-tenks network interfaces for Rocky 10

Network interfaces updated for Rocky 10 - `ens*` is now the default,
with `eth*` only being used on Rocky 9

Author: owenjones

etc/kayobe/environments/ci-tenks/inventory/group_vars/compute/network-interfaces

@@ -2,17 +2,17 @@
 ###############################################################################
 # Network interface definitions for the compute group.
 
-provision_oc_interface: "{{ 'ens2' if os_distribution == 'ubuntu' else 'eth0' }}"
+provision_oc_interface: "{{ 'eth0' if os_distribution == 'rocky' and os_release == '9' else 'ens2' }}"
 # Route via the seed-hypervisor to the outside world.
 provision_oc_gateway: 192.168.33.4
 
-internal_interface: "{{ 'ens3' if os_distribution == 'ubuntu' else 'eth1' }}.{{ internal_vlan }}"
+internal_interface: "{{ 'eth1' if os_distribution == 'rocky' and os_release == '9' else 'ens3' }}.{{ internal_vlan }}"
 
-storage_interface: "{{ 'ens3' if os_distribution == 'ubuntu' else 'eth1' }}.{{ storage_vlan }}"
+storage_interface: "{{ 'eth1' if os_distribution == 'rocky' and os_release == '9' else 'ens3' }}.{{ storage_vlan }}"
 
-tunnel_interface: "{{ 'ens3' if os_distribution == 'ubuntu' else 'eth1' }}.{{ tunnel_vlan }}"
+tunnel_interface: "{{ 'eth1' if os_distribution == 'rocky' and os_release == '9' else 'ens3' }}.{{ tunnel_vlan }}"
 
-external_interface: "{{ 'ens3' if os_distribution == 'ubuntu' else 'eth1' }}.{{ external_vlan }}"
+external_interface: "{{ 'eth1' if os_distribution == 'rocky' and os_release == '9' else 'ens3' }}.{{ external_vlan }}"
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.

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

@@ -2,25 +2,25 @@
 ###############################################################################
 # Network interface definitions for the controller group.
 
-provision_oc_interface: "{{ 'ens2' if os_distribution == 'ubuntu' else 'eth0' }}"
+provision_oc_interface: "{{ 'eth0' if os_distribution == 'rocky' and os_release == '9' else 'ens2' }}"
 # Route via the seed-hypervisor to the outside world.
 provision_oc_gateway: 192.168.33.4
 
-mgmt_interface: "{{ 'ens3' if os_distribution == 'ubuntu' else 'eth1' }}"
+mgmt_interface: "{{ 'eth1' if os_distribution == 'rocky' and os_release == '9' else 'ens3' }}"
 
-provision_wl_interface: "br{{ 'ens4' if os_distribution == 'ubuntu' else 'eth2' }}"
+provision_wl_interface: "br{{ 'eth2' if os_distribution == 'rocky' and os_release == '9' else 'ens4' }}"
 provision_wl_bridge_ports:
-  - "{{ 'ens4' if os_distribution == 'ubuntu' else 'eth2' }}"
+  - "{{ 'eth2' if os_distribution == 'rocky' and os_release == '9' else 'ens4' }}"
 
-internal_interface: "{{ 'ens4' if os_distribution == 'ubuntu' else 'eth2' }}.{{ internal_vlan }}"
+internal_interface: "{{ 'eth2' if os_distribution == 'rocky' and os_release == '9' else 'ens4' }}.{{ internal_vlan }}"
 
-external_interface: "br{{ 'ens4' if os_distribution == 'ubuntu' else 'eth2' }}.{{ external_vlan }}"
+external_interface: "br{{ 'eth2' if os_distribution == 'rocky' and os_release == '9' else 'ens4' }}.{{ external_vlan }}"
 
-public_interface: "{{ 'ens4' if os_distribution == 'ubuntu' else 'eth2' }}.{{ public_vlan }}"
+public_interface: "{{ 'eth2' if os_distribution == 'rocky' and os_release == '9' else 'ens4' }}.{{ public_vlan }}"
 
-storage_interface: "{{ 'ens4' if os_distribution == 'ubuntu' else 'eth2' }}.{{ storage_vlan }}"
+storage_interface: "{{ 'eth2' if os_distribution == 'rocky' and os_release == '9' else 'ens4' }}.{{ storage_vlan }}"
 
-tunnel_interface: "{{ 'ens4' if os_distribution == 'ubuntu' else 'eth2' }}.{{ tunnel_vlan }}"
+tunnel_interface: "{{ 'eth2' if os_distribution == 'rocky' and os_release == '9' else 'ens4' }}.{{ tunnel_vlan }}"
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.

etc/kayobe/environments/ci-tenks/inventory/group_vars/seed/network-interfaces

@@ -2,9 +2,9 @@
 ###############################################################################
 # Network interface definitions for the seed group.
 
-mgmt_interface: "{{ 'ens2' if os_distribution == 'ubuntu' else 'eth0' }}"
+mgmt_interface: "{{ 'eth0' if os_distribution == 'rocky' and os_release == '9' else 'ens2' }}"
 
-provision_oc_interface: "{{ 'ens3' if os_distribution == 'ubuntu' else 'eth1' }}"
+provision_oc_interface: "{{ 'eth1' if os_distribution == 'rocky' and os_release == '9' else 'ens3' }}"
 # Route via the seed-hypervisor to the outside world.
 provision_oc_gateway: 192.168.33.4
 

etc/kayobe/environments/ci-tenks/inventory/group_vars/storage/network-interfaces

@@ -2,15 +2,15 @@
 ###############################################################################
 # Network interface definitions for the compute group.
 
-provision_oc_interface: "{{ 'ens2' if os_distribution == 'ubuntu' else 'eth0' }}"
+provision_oc_interface: "{{ 'eth0' if os_distribution == 'rocky' and os_release == '9' else 'ens2' }}"
 # Route via the seed-hypervisor to the outside world.
 provision_oc_gateway: 192.168.33.4
 
-internal_interface: "{{ 'ens3' if os_distribution == 'ubuntu' else 'eth1' }}.{{ internal_vlan }}"
+internal_interface: "{{ 'eth1' if os_distribution == 'rocky' and os_release == '9' else 'ens3' }}.{{ internal_vlan }}"
 
-storage_interface: "{{ 'ens3' if os_distribution == 'ubuntu' else 'eth1' }}.{{ storage_vlan }}"
+storage_interface: "{{ 'eth1' if os_distribution == 'rocky' and os_release == '9' else 'ens3' }}.{{ storage_vlan }}"
 
-storage_mgmt_interface: "{{ 'ens3' if os_distribution == 'ubuntu' else 'eth1' }}.{{ storage_mgmt_vlan }}"
+storage_mgmt_interface: "{{ 'eth1' if os_distribution == 'rocky' and os_release == '9' else 'ens3' }}.{{ storage_mgmt_vlan }}"
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.