added default network connection for group_vars/staging + fixed *stg* dns_search1...3

inventory/group_vars/staging

@@ -1,5 +1,8 @@
 ---
 deployment_type: stg
+dns_search1: "stg.iad2.fedoraproject.org"
+dns_search2: "iad2.fedoraproject.org"
+dns_search2: "fedoraproject.org"
 env: staging
 env_prefix: stg.
 env_short: stg
@@ -19,6 +22,23 @@ mirrors_centos_org_cert_file: mirrors.stg.centos.org.cert
 # This is the mirrors.stg.centos.org certs
 mirrors_centos_org_cert_name: mirrors.stg.centos.org
 mirrors_centos_org_key_file: mirrors.stg.centos.org.key
+network_connections:
+  - autoconnect: yes
+    ip:
+      address:
+        - "{{ eth0_ipv4_ip }}/{{ eth0_ipv4_nm }}"
+      dhcp4: no
+      dns:
+        - "{{ dns1 }}"
+        - "{{ dns2 }}"
+      dns_search:
+        - "{{ dns_search1 }}"
+        - "{{ dns_search2 }}"
+        - "{{ dns_search3 }}"
+      gateway4: "{{ eth0_ipv4_gw }}"
+    mac: "{{ ansible_default_ipv4.macaddress }}"
+    name: eth0
+    type: ethernet
 ocp_wildcard_cert_file: wildcard-2021.apps.ocp.stg.fedoraproject.org.cert
 # This is the openshift wildcard cert for ocp stg
 ocp_wildcard_cert_name: wildcard-2021.apps.ocp.stg.fedoraproject.org

inventory/host_vars/bootstrap.ocp.stg.iad2.fedoraproject.org

@@ -1,10 +1,6 @@
 ---
 datacenter: iad2
 dns: "{{ dns1 }}"
-dns1: 10.3.163.33
-dns2: 10.3.163.34
-dns_search1: "stg.iad2.fedoraproject.org"
-dns_search3: "fedoraproject.org"
 eth0_ip: "{{eth0_ipv4}}"
 eth0_ipv4: 10.3.166.121
 eth0_ipv4_gw: 10.3.166.254
@@ -12,27 +8,8 @@ freezes: false
 gw: "{{ eth0_ipv4_gw }}"
 has_ipv4: yes
 lvm_size: 120g
-mac0: "{{ ansible_default_ipv4.macaddress }}"
 max_mem_size: 16384
 mem_size: 16384
-network_connections:
-  - autoconnect: yes
-    ip:
-      address:
-        - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      dhcp4: no
-      dns:
-        - "{{ dns1 }}"
-        - "{{ dns2 }}"
-      dns_search:
-        - "{{ dns_search1 }}"
-        - "{{ dns_search2 }}"
-        - "{{ dns_search3 }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-    mac: "{{ mac0 }}"
-    name: ens2
-    state: up
-    type: ethernet
 nm: 255.255.255.0
 nrpe_procs_crit: 1400
 nrpe_procs_warn: 1200

inventory/host_vars/bvmhost-a64-01.stg.iad2.fedoraproject.org

@@ -8,6 +8,7 @@ dns1: 10.3.163.33
 dns2: 10.3.163.34
 dns_search1: "stg.iad2.fedoraproject.org"
 dns_search2: "iad2.fedoraproject.org"
+dns_search3: "fedoraproject.org"
 has_ipv4: yes
 mac1: 50:6b:4b:6a:ef:20
 network_connections:
@@ -22,6 +23,7 @@ network_connections:
       dns_search:
         - "{{ dns_search1 }}"
         - "{{ dns_search2 }}"
+        - "{{ dns_search3 }}"
       gateway4: "{{ br0_ipv4_gw }}"
     name: br0
     state: up

inventory/host_vars/bvmhost-p08-01.stg.iad2.fedoraproject.org

@@ -6,8 +6,9 @@ br0_port0_mac: "{{ mac1 }}"
 datacenter: iad2
 dns1: 10.3.163.33
 dns2: 10.3.163.34
-dns_search1: "iad2.fedoraproject.org"
-dns_search2: "fedoraproject.org"
+dns_search1: "stg.iad2.fedoraproject.org"
+dns_search2: "iad2.fedoraproject.org"
+dns_search3: "fedoraproject.org"
 has_ipv4: yes
 mac1: 80:61:5f:06:96:5e
 network_connections:
@@ -22,6 +23,7 @@ network_connections:
       dns_search:
         - "{{ dns_search1 }}"
         - "{{ dns_search2 }}"
+        - "{{ dns_search3 }}"
       gateway4: "{{ br0_ipv4_gw }}"
     name: br0
     state: up

inventory/host_vars/ocp01.ocp.stg.iad2.fedoraproject.org

@@ -4,6 +4,7 @@ dns: "{{ dns1 }}"
 dns1: 10.3.163.33
 dns2: 10.3.163.34
 dns_search1: "stg.iad2.fedoraproject.org"
+dns_search2: "iad2.fedoraproject.org"
 dns_search3: "fedoraproject.org"
 eth0_ip: "{{eth0_ipv4}}"
 eth0_ipv4: 10.3.166.115

inventory/host_vars/ocp02.ocp.stg.iad2.fedoraproject.org

@@ -4,6 +4,7 @@ dns: "{{ dns1 }}"
 dns1: 10.3.163.33
 dns2: 10.3.163.34
 dns_search1: "stg.iad2.fedoraproject.org"
+dns_search2: "iad2.fedoraproject.org"
 dns_search3: "fedoraproject.org"
 eth0_ip: "{{eth0_ipv4}}"
 eth0_ipv4: 10.3.166.116

inventory/host_vars/ocp03.ocp.stg.iad2.fedoraproject.org

@@ -4,6 +4,7 @@ dns: "{{ dns1 }}"
 dns1: 10.3.163.33
 dns2: 10.3.163.34
 dns_search1: "stg.iad2.fedoraproject.org"
+dns_search2: "iad2.fedoraproject.org"
 dns_search3: "fedoraproject.org"
 eth0_ip: "{{eth0_ipv4}}"
 eth0_ipv4: 10.3.166.117

inventory/host_vars/pagure-stg01.fedoraproject.org

@@ -1,6 +1,10 @@
 ---
 datacenter: rdu-cc
 dns1: 8.8.8.8
+dns2: 8.8.4.4
+dns_search1: "stg.iad2.fedoraproject.org"
+dns_search2: "iad2.fedoraproject.org"
+dns_search3: "fedoraproject.org"
 effective_cache_size: "6GB"
 eth0_ipv4_gw: 8.43.85.254
 eth0_ipv4_ip: 8.43.85.77
@@ -24,6 +28,7 @@ network_connections:
       dns_search:
         - "{{ dns_search1 }}"
         - "{{ dns_search2 }}"
+        - "{{ dns_search3 }}"
       gateway4: "{{ eth0_ipv4_gw }}"
       gateway6: "{{ eth0_ipv4_gw }}"
     mac: "{{ ansible_default_ipv4.macaddress }}"

inventory/host_vars/vmhost-ocp01.stg.iad2.fedoraproject.org

@@ -1,9 +0,0 @@
----
-# This virthost only has stg instances, so it doesn't freeze
-br0_dev: eno1
-br0_gw: 10.3.166.254
-br0_ip: 10.3.166.90
-br0_nm: 255.255.255.0
-dns: 10.3.163.33
-freezes: false
-nested: true

inventory/host_vars/vmhost-ocp02.stg.iad2.fedoraproject.org

@@ -1,9 +0,0 @@
----
-# This virthost only has stg instances, so it doesn't freeze
-br0_dev: eno1
-br0_gw: 10.3.166.254
-br0_ip: 10.3.166.91
-br0_nm: 255.255.255.0
-dns: 10.3.163.33
-freezes: false
-nested: true

inventory/host_vars/vmhost-ocp03.stg.iad2.fedoraproject.org

@@ -1,9 +0,0 @@
----
-# This virthost only has stg instances, so it doesn't freeze
-br0_dev: eno1
-br0_gw: 10.3.166.254
-br0_ip: 10.3.166.92
-br0_nm: 255.255.255.0
-dns: 10.3.163.33
-freezes: false
-nested: true

inventory/host_vars/vmhost-ocp04.stg.iad2.fedoraproject.org

@@ -1,9 +0,0 @@
----
-# This virthost only has stg instances, so it doesn't freeze
-br0_dev: eno1
-br0_gw: 10.3.166.254
-br0_ip: 10.3.166.93
-br0_nm: 255.255.255.0
-dns: 10.3.163.33
-freezes: false
-nested: true

inventory/host_vars/vmhost-x86-12.stg.iad2.fedoraproject.org

@@ -4,7 +4,11 @@ br0_ipv4: 10.3.166.29
 br0_ipv4_gw: 10.3.166.254
 br0_ipv4_nm: 24
 br0_port0_mac: "{{ mac1 }}"
-dns: 10.3.163.33
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+dns_search1: "stg.iad2.fedoraproject.org"
+dns_search2: "iad2.fedoraproject.org"
+dns_search3: "fedoraproject.org"
 freezes: false
 has_ipv4: yes
 mac1: E4:43:4B:F7:AD:10
@@ -21,11 +25,12 @@ network_connections:
         - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}"
       dhcp4: no
       dns:
-        - "{{ dns }}"
+        - "{{ dns1 }}"
+        - "{{ dns2 }}"
       dns_search:
-        - stg.iad2.fedoraproject.org
-        - iad2.fedoraproject.org
-        - fedoraproject.org
+        - "{{ dns_search1 }}"
+        - "{{ dns_search2 }}"
+        - "{{ dns_search3 }}"
       gateway4: "{{ br0_ipv4_gw }}"
     name: br0
     state: up

inventory/host_vars/worker01.ocp.stg.iad2.fedoraproject.org

@@ -5,6 +5,7 @@ dns: "{{ dns1 }}"
 dns1: 10.3.163.33
 dns2: 10.3.163.34
 dns_search1: "stg.iad2.fedoraproject.org"
+dns_search2: "iad2.fedoraproject.org"
 dns_search3: "fedoraproject.org"
 eth0_ip: "{{eth0_ipv4}}"
 eth0_ipv4: 10.3.166.118

inventory/host_vars/worker02.ocp.stg.iad2.fedoraproject.org

@@ -5,6 +5,7 @@ dns: "{{ dns1 }}"
 dns1: 10.3.163.33
 dns2: 10.3.163.34
 dns_search1: "stg.iad2.fedoraproject.org"
+dns_search2: "iad2.fedoraproject.org"
 dns_search3: "fedoraproject.org"
 eth0_ip: "{{eth0_ipv4}}"
 eth0_ipv4: 10.3.166.119

inventory/host_vars/worker03.ocp.stg.iad2.fedoraproject.org

@@ -5,6 +5,7 @@ dns: "{{ dns1 }}"
 dns1: 10.3.163.33
 dns2: 10.3.163.34
 dns_search1: "stg.iad2.fedoraproject.org"
+dns_search2: "iad2.fedoraproject.org"
 dns_search3: "fedoraproject.org"
 eth0_ip: "{{eth0_ipv4}}"
 eth0_ipv4: 10.3.166.120

inventory/host_vars/worker04.ocp.stg.iad2.fedoraproject.org

@@ -4,6 +4,7 @@ dns: "{{ dns1 }}"
 dns1: 10.3.163.33
 dns2: 10.3.163.34
 dns_search1: "stg.iad2.fedoraproject.org"
+dns_search2: "iad2.fedoraproject.org"
 dns_search3: "fedoraproject.org"
 eth0_ip: "{{eth0_ipv4}}"
 eth0_ipv4: 10.3.166.122

inventory/host_vars/worker05.ocp.stg.iad2.fedoraproject.org

@@ -4,6 +4,7 @@ dns: "{{ dns1 }}"
 dns1: 10.3.163.33
 dns2: 10.3.163.34
 dns_search1: "stg.iad2.fedoraproject.org"
+dns_search2: "iad2.fedoraproject.org"
 dns_search3: "fedoraproject.org"
 eth0_ip: "{{eth0_ipv4}}"
 eth0_ipv4: 10.3.166.123