openqa: deploy a64-worker05 and 06 (to prod), cut down 04 count

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

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

@@ -61,8 +61,9 @@ nrpe_procs_warn: 250
 # has an HW RNG, so let's have rngd
 openqa_rngd: true
 openqa_tap_iface: enP1p1s0f0np0
-# this is a powerful machine, can handle more openQA workers
-openqa_workers: 35
+# this is a powerful machine, but storage kinda limits how many workers
+# we can safely run at once
+openqa_workers: 25
 # also means we need to bump the load average threshold
 openqa_critical_threshold: 100
 sudoers: "{{ private }}/files/sudo/qavirt-sudoers"

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

@@ -0,0 +1,65 @@
+---
+datacenter: iad2
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+dns_search1: "iad2.fedoraproject.org"
+dns_search2: "fedoraproject.org"
+enP2p1s0_mac: "{{ mac1 }}"
+enp1s0_ipv4: 10.3.174.65
+enp1s0_ipv4_gw: 10.3.174.254
+enp1s0_ipv4_nm: 24
+enp1s0_mac: "{{ mac2 }}"
+enp1s0d1_mac: "{{ mac3 }}"
+freezes: false
+# enP2p1s0 is disabled/nothing
+# enp1s0 is active network
+# enp1s0d1 is disabled/nothing
+# NOTE network configuration beyond the scope of linux-system-roles on
+# this host is performed by the openqa/worker role
+
+has_ipv4: yes
+mac1: 68:05:ca:8a:f0:29
+mac2: 50:6b:4b:6a:eb:b0
+mac3: 50:6b:4b:6a:eb:b1
+network_connections:
+  - autoconnect: no
+    mac: "{{ enP2p1s0_mac }}"
+    name: enP2p1s0
+    state: down
+    type: ethernet
+  - autoconnect: yes
+    ip:
+      address:
+        - "{{ enp1s0_ipv4 }}/{{ enp1s0_ipv4_nm }}"
+      dhcp4: no
+      dns:
+        - "{{ dns1 }}"
+        - "{{ dns2 }}"
+      dns_search:
+        - "{{ dns_search1 }}"
+        - "{{ dns_search2 }}"
+      gateway4: "{{ enp1s0_ipv4_gw }}"
+    mac: "{{ enp1s0_mac }}"
+    name: enp1s0
+    state: up
+    type: ethernet
+  - autoconnect: no
+    mac: "{{ enp1s0d1_mac }}"
+    name: enp1s0d1
+    state: down
+    type: ethernet
+nrpe_procs_crit: 300
+nrpe_procs_warn: 250
+# has an HW RNG, so let's have rngd
+openqa_rngd: true
+openqa_tap_iface: enp1s0
+# this is a moderately powerful machine (16c/32t, I think)
+openqa_workers: 15
+sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
+# firewall ports for server->worker websockets connections
+# this port is 'QEMUPORT plus 1'
+# QEMUPORT is:
+# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002;
+# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc
+tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153']
+nbde_device: /dev/sda3

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

@@ -0,0 +1,65 @@
+---
+datacenter: iad2
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+dns_search1: "iad2.fedoraproject.org"
+dns_search2: "fedoraproject.org"
+enP2p1s0_mac: "{{ mac1 }}"
+enp1s0_ipv4: 10.3.174.66
+enp1s0_ipv4_gw: 10.3.174.254
+enp1s0_ipv4_nm: 24
+enp1s0_mac: "{{ mac2 }}"
+enp1s0d1_mac: "{{ mac3 }}"
+freezes: false
+# enP2p1s0 is disabled/nothing
+# enp1s0 is active network
+# enp1s0d1 is disabled/nothing
+# NOTE network configuration beyond the scope of linux-system-roles on
+# this host is performed by the openqa/worker role
+
+has_ipv4: yes
+mac1: 68:05:ca:8e:98:c7
+mac2: 50:6b:4b:6a:c4:90
+mac3: 50:6b:4b:6a:c4:91
+network_connections:
+  - autoconnect: no
+    mac: "{{ enP2p1s0_mac }}"
+    name: enP2p1s0
+    state: down
+    type: ethernet
+  - autoconnect: yes
+    ip:
+      address:
+        - "{{ enp1s0_ipv4 }}/{{ enp1s0_ipv4_nm }}"
+      dhcp4: no
+      dns:
+        - "{{ dns1 }}"
+        - "{{ dns2 }}"
+      dns_search:
+        - "{{ dns_search1 }}"
+        - "{{ dns_search2 }}"
+      gateway4: "{{ enp1s0_ipv4_gw }}"
+    mac: "{{ enp1s0_mac }}"
+    name: enp1s0
+    state: up
+    type: ethernet
+  - autoconnect: no
+    mac: "{{ enp1s0d1_mac }}"
+    name: enp1s0d1
+    state: down
+    type: ethernet
+nrpe_procs_crit: 300
+nrpe_procs_warn: 250
+# has an HW RNG, so let's have rngd
+openqa_rngd: true
+openqa_tap_iface: enp1s0
+# this is a moderately powerful machine (16c/32t, I think)
+openqa_workers: 15
+sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
+# firewall ports for server->worker websockets connections
+# this port is 'QEMUPORT plus 1'
+# QEMUPORT is:
+# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002;
+# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc
+tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153']
+nbde_device: /dev/sda3

inventory/inventory

@@ -322,6 +322,9 @@ openqa-x86-worker02.iad2.fedoraproject.org
 openqa-x86-worker06.iad2.fedoraproject.org
 # 2023 newer, more powerful box
 openqa-a64-worker04.iad2.fedoraproject.org
+# older emags. they're helping! they're helping!
+openqa-a64-worker05.iad2.fedoraproject.org
+openqa-a64-worker06.iad2.fedoraproject.org
 
 # openqa-lab and openqa-lab-workers are pseudo-stg, see group_vars/openqa-stg for more details
 [openqa_lab]
@@ -352,6 +355,7 @@ openqa-x86-worker03.iad2.fedoraproject.org
 [openqa_tap1_workers]
 # prod
 openqa-x86-worker01.iad2.fedoraproject.org
+openqa-a64-worker04.iad2.fedoraproject.org
 # lab
 openqa-x86-worker04.iad2.fedoraproject.org
 openqa-a64-worker03.iad2.fedoraproject.org
@@ -359,15 +363,11 @@ openqa-p09-worker01.iad2.fedoraproject.org
 [openqa_tap2_workers]
 # prod
 openqa-x86-worker02.iad2.fedoraproject.org
+openqa-a64-worker05.iad2.fedoraproject.org
 # lab
 openqa-x86-worker05.iad2.fedoraproject.org
 openqa-a64-worker02.iad2.fedoraproject.org
 openqa-p09-worker02.iad2.fedoraproject.org
-# these do both tap and tap2 - the shiny new a64 worker is way better
-# than the busted old ones, so for prod it does everything
-[openqa_tap12_workers]
-# prod
-openqa-a64-worker04.iad2.fedoraproject.org
 
 # the workers that run createhdds to create the base disk images. Again,
 # only one per arch per instance should be present.