openQA: switch all other worker hosts to system-roles networking

Seemed to work OK on the test system, so let's go the whole hog.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

inventory/host_vars/openqa-a64-worker02.iad2.fedoraproject.org

@@ -3,27 +3,67 @@ freezes: false
 # eth0 is disabled/nothing
 # eth1 is active network
 # eth2 is disabled/nothing
-ansible_ifcfg_infra_net_devices: ['eth1']
-gw: 10.3.174.254
-dns: 10.3.163.33
-eth1_ip: 10.3.174.62
-eth1_nm: 255.255.255.0
+# NOTE network configuration beyond the scope of linux-system-roles on
+# this host is performed by the openqa/worker role
+
 datacenter: iad2
+
+mac1: 00:1b:21:e0:6a:72
+mac2: 50:6b:4b:7f:a8:b0
+mac3: 50:6b:4b:7f:a8:b1
+
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+
+dns_search1: "iad2.fedoraproject.org"
+dns_search2: "fedoraproject.org"
+
+has_ipv4: yes
+
+eth0_mac: "{{ mac1 }}"
+
+eth1_ipv4: 10.3.174.62
+eth1_ipv4_nm: 24
+eth1_ipv4_gw: 10.3.174.254
+eth1_mac: "{{ mac2 }}"
+
+eth2_mac: "{{ mac3 }}"
+
+network_connections:
+- name: eth0
+  mac: "{{ eth0_mac }}"
+  state: down
+  type: ethernet
+  autoconnect: no
+- name: eth1
+  mac: "{{ eth1_mac }}"
+  state: up
+  type: ethernet
+  autoconnect: yes
+  ip:
+    address:
+    - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}"
+    gateway4: "{{ eth1_ipv4_gw }}"
+    dns:
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search:
+    - "{{ dns_search1 }}"
+    - "{{ dns_search2 }}"
+    dhcp4: no
+    auto6: no
+- name: eth2
+  mac: "{{ eth2_mac }}"
+  state: down
+  type: ethernet
+  autoconnect: no
+
 nrpe_procs_warn: 250
 nrpe_procs_crit: 300
 
 sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 
-# openQA tap worker hosts (like this one) do stuff with ifcfg that base
-# doesn't understand. terrible, terrible stuff. seriously - it doesn't
-# handle the openvswitch config well. so let's tell it to just configure
-# the regular interfaces (which on this system is eth0-eth2) for us,
-# disabling all but the one we want to use (eth0), and leave everything
-# else alone. We use a variable definition here so the firewall config
-# (in the openqa_tap_workers group_vars) can reuse it.
 openqa_tap_iface: eth1
-ansible_ifcfg_allowlist: ['eth0', '{{ openqa_tap_iface }}', 'eth2']
-ansible_ifcfg_disabled: ['eth0', 'eth2']
 
 # this is a powerful machine, can handle more openQA workers
 openqa_workers: 15
@@ -35,4 +75,4 @@ openqa_workers: 15
 tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153']
 
 # has an HW RNG, so let's have rngd
-openqa_rngd: True
+openqa_rngd: true

inventory/host_vars/openqa-a64-worker03.iad2.fedoraproject.org

@@ -3,27 +3,65 @@ freezes: false
 # eth0 is disabled/nothing
 # eth1 is active network
 # eth2 is disabled/nothing
-ansible_ifcfg_infra_net_devices: ['eth1']
-gw: 10.3.174.254
-dns: 10.3.163.33
-eth1_ip: 10.3.174.63
-eth1_nm: 255.255.255.0
+
 datacenter: iad2
+
+mac1: 00:1b:21:e0:6e:5b
+mac2: 50:6b:4b:7f:98:30
+mac3: 50:6b:4b:7f:98:31
+
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+
+dns_search1: "iad2.fedoraproject.org"
+dns_search2: "fedoraproject.org"
+
+has_ipv4: yes
+
+eth0_mac: "{{ mac1 }}"
+
+eth1_ipv4: 10.3.174.63
+eth1_ipv4_nm: 24
+eth1_ipv4_gw: 10.3.174.254
+eth1_mac: "{{ mac2 }}"
+
+eth2_mac: "{{ mac3 }}"
+
+network_connections:
+- name: eth0
+  mac: "{{ eth0_mac }}"
+  state: down
+  type: ethernet
+  autoconnect: no
+- name: eth1
+  mac: "{{ eth1_mac }}"
+  state: up
+  type: ethernet
+  autoconnect: yes
+  ip:
+    address:
+    - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}"
+    gateway4: "{{ eth1_ipv4_gw }}"
+    dns:
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search:
+    - "{{ dns_search1 }}"
+    - "{{ dns_search2 }}"
+    dhcp4: no
+    auto6: no
+- name: eth2
+  mac: "{{ eth2_mac }}"
+  state: down
+  type: ethernet
+  autoconnect: no
+
 nrpe_procs_warn: 250
 nrpe_procs_crit: 300
 
 sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 
-# openQA tap worker hosts (like this one) do stuff with ifcfg that base
-# doesn't understand. terrible, terrible stuff. seriously - it doesn't
-# handle the openvswitch config well. so let's tell it to just configure
-# the regular interfaces (which on this system is eth0-eth2) for us,
-# disabling all but the one we want to use (eth0), and leave everything
-# else alone. We use a variable definition here so the firewall config
-# (in the openqa_tap_workers group_vars) can reuse it.
 openqa_tap_iface: eth1
-ansible_ifcfg_allowlist: ['eth0', '{{ openqa_tap_iface }}', 'eth2']
-ansible_ifcfg_disabled: ['eth0', 'eth2']
 
 # this is a powerful machine, can handle more openQA workers
 openqa_workers: 15
@@ -35,4 +73,4 @@ openqa_workers: 15
 tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153']
 
 # has an HW RNG, so let's have rngd
-openqa_rngd: True
+openqa_rngd: true

inventory/host_vars/openqa-p09-worker01.iad2.fedoraproject.org

@@ -3,27 +3,67 @@ freezes: false
 # eth0 is default network
 # eth1 is disabled/nothing
 # eth2 is disabled/nothing
-ansible_ifcfg_infra_net_devices: ['eth0']
-gw: 10.3.174.254
-dns: 10.3.163.33
-eth0_ip: 10.3.174.42
-eth0_nm: 255.255.255.0
+# NOTE network configuration beyond the scope of linux-system-roles on
+# this host is performed by the openqa/worker role
+
 datacenter: iad2
+
+mac1: 40:a6:b7:18:87:24
+mac2: 40:a6:b7:18:87:25
+mac3: ac:1f:6b:56:e5:90
+
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+
+dns_search1: "iad2.fedoraproject.org"
+dns_search2: "fedoraproject.org"
+
+has_ipv4: yes
+
+eth0_ipv4: 10.3.174.42
+eth0_ipv4_nm: 24
+eth0_ipv4_gw: 10.3.174.254
+eth0_mac: "{{ mac1 }}"
+
+eth1_mac: "{{ mac2 }}"
+
+eth2_mac: "{{ mac3 }}"
+
+network_connections:
+- name: eth0
+  mac: "{{ eth0_mac }}"
+  state: up
+  type: ethernet
+  autoconnect: yes
+  ip:
+    address:
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns:
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search:
+    - "{{ dns_search1 }}"
+    - "{{ dns_search2 }}"
+    dhcp4: no
+    auto6: no
+- name: eth1
+  mac: "{{ eth1_mac }}"
+  state: down
+  type: ethernet
+  autoconnect: no
+- name: eth2
+  mac: "{{ eth2_mac }}"
+  state: down
+  type: ethernet
+  autoconnect: no
+
 nrpe_procs_warn: 250
 nrpe_procs_crit: 300
 
 sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 
-# openQA tap worker hosts (like this one) do stuff with ifcfg that base
-# doesn't understand. terrible, terrible stuff. seriously - it doesn't
-# handle the openvswitch config well. so let's tell it to just configure
-# the regular interfaces (which on this system is eth0-eth2) for us,
-# disabling all but the one we want to use (eth0), and leave everything
-# else alone. We use a variable definition here so the firewall config
-# (in the openqa_tap_workers group_vars) can reuse it.
 openqa_tap_iface: eth0
-ansible_ifcfg_allowlist: ['{{ openqa_tap_iface }}', 'eth1', 'eth2', 'eth3', 'eth4', 'eth5', 'eth6', 'eth7', 'eth8', 'eth9']
-ansible_ifcfg_disabled: ['eth1', 'eth2', 'eth3', 'eth4', 'eth5', 'eth6', 'eth7', 'eth8', 'eth9']
 
 # this is a powerful machine, can handle more openQA workers
 openqa_workers: 15
@@ -35,4 +75,4 @@ openqa_workers: 15
 tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153']
 
 # has an HW RNG, so let's have rngd
-openqa_rngd: True
+openqa_rngd: true

inventory/host_vars/openqa-p09-worker02.iad2.fedoraproject.org

@@ -3,27 +3,65 @@ freezes: false
 # eth0 is default network
 # eth1 is disabled/nothing
 # eth2 is disabled/nothing
-ansible_ifcfg_infra_net_devices: ['eth0']
-gw: 10.3.174.254
-dns: 10.3.163.33
-eth0_ip: 10.3.174.43
-eth0_nm: 255.255.255.0
+
 datacenter: iad2
+
+mac1: FI:XM:EF:IX:ME:FI
+mac2: FI:XM:EF:IX:ME:FI
+mac3: FI:XM:EF:IX:ME:FI
+
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+
+dns_search1: "iad2.fedoraproject.org"
+dns_search2: "fedoraproject.org"
+
+has_ipv4: yes
+
+eth0_ipv4: 10.3.174.43
+eth0_ipv4_nm: 24
+eth0_ipv4_gw: 10.3.174.254
+eth0_mac: "{{ mac1 }}"
+
+eth1_mac: "{{ mac2 }}"
+
+eth2_mac: "{{ mac3 }}"
+
+network_connections:
+- name: eth0
+  mac: "{{ eth0_mac }}"
+  state: up
+  type: ethernet
+  autoconnect: yes
+  ip:
+    address:
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns:
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search:
+    - "{{ dns_search1 }}"
+    - "{{ dns_search2 }}"
+    dhcp4: no
+    auto6: no
+- name: eth1
+  mac: "{{ eth1_mac }}"
+  state: down
+  type: ethernet
+  autoconnect: no
+- name: eth2
+  mac: "{{ eth2_mac }}"
+  state: down
+  type: ethernet
+  autoconnect: no
+
 nrpe_procs_warn: 250
 nrpe_procs_crit: 300
 
 sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 
-# openQA tap worker hosts (like this one) do stuff with ifcfg that base
-# doesn't understand. terrible, terrible stuff. seriously - it doesn't
-# handle the openvswitch config well. so let's tell it to just configure
-# the regular interfaces (which on this system is eth0-eth2) for us,
-# disabling all but the one we want to use (eth0), and leave everything
-# else alone. We use a variable definition here so the firewall config
-# (in the openqa_tap_workers group_vars) can reuse it.
 openqa_tap_iface: eth0
-ansible_ifcfg_allowlist: ['{{ openqa_tap_iface }}', 'eth1', 'eth2', 'eth3', 'eth4', 'eth5', 'eth6', 'eth7', 'eth8', 'eth9']
-ansible_ifcfg_disabled: ['eth1', 'eth2', 'eth3', 'eth4', 'eth5', 'eth6', 'eth7', 'eth8', 'eth9']
 
 # this is a powerful machine, can handle more openQA workers
 openqa_workers: 15
@@ -35,4 +73,4 @@ openqa_workers: 15
 tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153']
 
 # has an HW RNG, so let's have rngd
-openqa_rngd: True
+openqa_rngd: true

inventory/host_vars/openqa-x86-worker01.iad2.fedoraproject.org

@@ -1,29 +1,81 @@
 ---
 freezes: false
-sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
+# em1 is default network
+# em2 is disabled/nothing
+# em3 is disabled/nothing
+# em4 is disabled/nothing
+# NOTE network configuration beyond the scope of linux-system-roles on
+# this host is performed by the openqa/worker role
+
+datacenter: iad2
+
+mac1: e4:43:4b:a7:98:66
+mac2: e4:43:4b:a7:98:68
+mac3: e4:43:4b:a7:98:86
+mac4: e4:43:4b:a7:98:87
+
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+
+dns_search1: "iad2.fedoraproject.org"
+dns_search2: "fedoraproject.org"
+
+has_ipv4: yes
+
+em1_ipv4: 10.3.174.21
+em1_ipv4_nm: 24
+em1_ipv4_gw: 10.3.174.254
+em1_mac: "{{ mac1 }}"
+
+em2_mac: "{{ mac2 }}"
+
+em3_mac: "{{ mac3 }}"
+
+em4_mac: "{{ mac4 }}"
+
+network_connections:
+- name: em1
+  mac: "{{ em1_mac }}"
+  state: up
+  type: ethernet
+  autoconnect: yes
+  ip:
+    address:
+    - "{{ em1_ipv4 }}/{{ em1_ipv4_nm }}"
+    gateway4: "{{ em1_ipv4_gw }}"
+    dns:
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search:
+    - "{{ dns_search1 }}"
+    - "{{ dns_search2 }}"
+    dhcp4: no
+    auto6: no
+- name: em2
+  mac: "{{ em2_mac }}"
+  state: down
+  type: ethernet
+  autoconnect: no
+- name: em3
+  mac: "{{ em3_mac }}"
+  state: down
+  type: ethernet
+  autoconnect: no
+- name: em4
+  mac: "{{ em4_mac }}"
+  state: down
+  type: ethernet
+  autoconnect: no
 
 nrpe_procs_warn: 1400
 nrpe_procs_crit: 1600
 
-# the if connected to the infra network on this box is em1
-ansible_ifcfg_infra_net_devices: [ 'em1' ]
-em1_ip: 10.3.174.21
-em1_nm: 255.255.255.0
-gw: 10.3.174.254
+sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 
-# openQA tap worker hosts (like this one) do stuff with ifcfg that base
-# doesn't understand. terrible, terrible stuff. seriously - it doesn't
-# handle the openvswitch config well. so let's tell it to just configure
-# the regular interfaces (which on this system is em1-4) for us,
-# disabling all but the one we want to use (em1), and leave everything
-# else alone. We use a variable definition here so the firewall config
-# (in the openqa_tap_workers group_vars) can reuse it.
 openqa_tap_iface: em1
-ansible_ifcfg_allowlist: ['{{ openqa_tap_iface }}', 'em2', 'em3', 'em4']
-ansible_ifcfg_disabled: ['em2', 'em3', 'em4']
 
 # Has a hardware RNG
-openqa_rngd: True
+openqa_rngd: true
 
 # this is a powerful machine, can handle more openQA workers
 openqa_workers: 30

inventory/host_vars/openqa-x86-worker02.iad2.fedoraproject.org

@@ -1,29 +1,79 @@
 ---
 freezes: false
-sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
+# em1 is default network
+# em2 is disabled/nothing
+# em3 is disabled/nothing
+# em4 is disabled/nothing
+
+datacenter: iad2
+
+mac1: e4:43:4b:23:e8:cc
+mac2: e4:43:4b:23:e8:ce
+mac3: e4:43:4b:23:e8:ec
+mac4: e4:43:4b:23:e8:ed
+
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+
+dns_search1: "iad2.fedoraproject.org"
+dns_search2: "fedoraproject.org"
+
+has_ipv4: yes
+
+em1_ipv4: 10.3.174.22
+em1_ipv4_nm: 24
+em1_ipv4_gw: 10.3.174.254
+em1_mac: "{{ mac1 }}"
+
+em2_mac: "{{ mac2 }}"
+
+em3_mac: "{{ mac3 }}"
+
+em4_mac: "{{ mac4 }}"
+
+network_connections:
+- name: em1
+  mac: "{{ em1_mac }}"
+  state: up
+  type: ethernet
+  autoconnect: yes
+  ip:
+    address:
+    - "{{ em1_ipv4 }}/{{ em1_ipv4_nm }}"
+    gateway4: "{{ em1_ipv4_gw }}"
+    dns:
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search:
+    - "{{ dns_search1 }}"
+    - "{{ dns_search2 }}"
+    dhcp4: no
+    auto6: no
+- name: em2
+  mac: "{{ em2_mac }}"
+  state: down
+  type: ethernet
+  autoconnect: no
+- name: em3
+  mac: "{{ em3_mac }}"
+  state: down
+  type: ethernet
+  autoconnect: no
+- name: em4
+  mac: "{{ em4_mac }}"
+  state: down
+  type: ethernet
+  autoconnect: no
 
 nrpe_procs_warn: 1400
 nrpe_procs_crit: 1600
 
-# the if connected to the infra network on this box is em1
-ansible_ifcfg_infra_net_devices: [ 'em1' ]
-em1_ip: 10.3.174.22
-em1_nm: 255.255.255.0
-gw: 10.3.174.254
+sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 
-# openQA tap worker hosts (like this one) do stuff with ifcfg that base
-# doesn't understand. terrible, terrible stuff. seriously - it doesn't
-# handle the openvswitch config well. so let's tell it to just configure
-# the regular interfaces (which on this system is em1-4) for us,
-# disabling all but the one we want to use (em1), and leave everything
-# else alone. We use a variable definition here so the firewall config
-# (in the openqa_tap_workers group_vars) can reuse it.
 openqa_tap_iface: em1
-ansible_ifcfg_allowlist: ['{{ openqa_tap_iface }}', 'em2', 'em3', 'em4']
-ansible_ifcfg_disabled: ['em2', 'em3', 'em4']
 
 # Has a hardware RNG
-openqa_rngd: True
+openqa_rngd: true
 
 # this is a powerful machine, can handle more openQA workers
 openqa_workers: 30

inventory/host_vars/openqa-x86-worker04.iad2.fedoraproject.org

@@ -1,31 +1,81 @@
 ---
 freezes: false
-sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
+# eth0 is default network
+# eth1 is disabled/nothing
+# eth2 is disabled/nothing
+# eth3 is disabled/nothing
+# NOTE network configuration beyond the scope of linux-system-roles on
+# this host is performed by the openqa/worker role
+
+datacenter: iad2
+
+mac1: e4:43:4b:24:10:aa
+mac2: e4:43:4b:24:10:ca
+mac3: e4:43:4b:24:10:ac
+mac4: e4:43:4b:24:10:cb
+
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+
+dns_search1: "iad2.fedoraproject.org"
+dns_search2: "fedoraproject.org"
+
+has_ipv4: yes
+
+eth0_ipv4: 10.3.174.24
+eth0_ipv4_nm: 24
+eth0_ipv4_gw: 10.3.174.254
+eth0_mac: "{{ mac1 }}"
+
+eth1_mac: "{{ mac2 }}"
+
+eth2_mac: "{{ mac3 }}"
+
+eth3_mac: "{{ mac4 }}"
+
+network_connections:
+- name: eth0
+  mac: "{{ eth0_mac }}"
+  state: up
+  type: ethernet
+  autoconnect: yes
+  ip:
+    address:
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns:
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search:
+    - "{{ dns_search1 }}"
+    - "{{ dns_search2 }}"
+    dhcp4: no
+    auto6: no
+- name: eth1
+  mac: "{{ eth1_mac }}"
+  state: down
+  type: ethernet
+  autoconnect: no
+- name: eth2
+  mac: "{{ eth2_mac }}"
+  state: down
+  type: ethernet
+  autoconnect: no
+- name: eth3
+  mac: "{{ eth3_mac }}"
+  state: down
+  type: ethernet
+  autoconnect: no
 
 nrpe_procs_warn: 1400
 nrpe_procs_crit: 1600
 
-# the if connected to the infra network on this box is em1
-ansible_ifcfg_infra_net_devices: [ 'em1' ]
-em1_ip: 10.3.174.24
-em1_nm: 255.255.255.0
-gw: 10.3.174.254
-dns: 10.3.163.33
-nm: 255.255.255.0
+sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 
-# openQA tap worker hosts (like this one) do stuff with ifcfg that base
-# doesn't understand. terrible, terrible stuff. seriously - it doesn't
-# handle the openvswitch config well. so let's tell it to just configure
-# the regular interfaces (which on this system is em1-4) for us,
-# disabling all but the one we want to use (em1), and leave everything
-# else alone. We use a variable definition here so the firewall config
-# (in the openqa_tap_workers group_vars) can reuse it.
-openqa_tap_iface: em1
-ansible_ifcfg_allowlist: ['{{ openqa_tap_iface }}', 'em2', 'em3', 'em4']
-ansible_ifcfg_disabled: ['em2', 'em3', 'em4']
+openqa_tap_iface: eth0
 
 # Has a hardware RNG
-openqa_rngd: True
+openqa_rngd: true
 
 # this is a powerful machine, can handle more openQA workers
 openqa_workers: 20