diff --git a/inventory/host_vars/buildhw-a64-01.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-01.iad2.fedoraproject.org
index f552042aad..31ab58bc35 100644
--- a/inventory/host_vars/buildhw-a64-01.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-a64-01.iad2.fedoraproject.org
@@ -5,27 +5,27 @@ eth1_ipv4_gw: 10.3.170.254
 datacenter: iad2
 
 network_connections:
-  - name: eth0
-    type: ethernet
-    autoconnect: no
-    mac: 68:05:ca:8e:ab:e6
-  - name: eth1
-    state: up
-    type: ethernet
-    mac: 50:6b:4b:6b:08:50
-    autoconnect: yes
-    ip:
-      address: 10.3.170.121/24
-      gateway4: 10.3.170.254
-      dns:
-      - 10.3.163.33
-      - 10.3.163.34
-      dns_search:
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
-  - name: eth2
-    mac: 50:6b:4b:6b:08:51
-    type: ethernet
-    autoconnect: no
+- name: eth0
+  type: ethernet
+  autoconnect: no
+  mac: 68:05:ca:8e:ab:e6
+- name: eth1
+  state: up
+  type: ethernet
+  mac: 50:6b:4b:6b:08:50
+  autoconnect: yes
+  ip:
+    address: 10.3.170.121/24
+    gateway4: 10.3.170.254
+    dns:
+    - 10.3.163.33
+    - 10.3.163.34
+    dns_search:
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth2
+  mac: 50:6b:4b:6b:08:51
+  type: ethernet
+  autoconnect: no
diff --git a/inventory/host_vars/buildhw-a64-02.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-02.iad2.fedoraproject.org
index 566b594347..70786856c4 100644
--- a/inventory/host_vars/buildhw-a64-02.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-a64-02.iad2.fedoraproject.org
@@ -15,31 +15,31 @@ mac1: 50:6b:4b:6a:ec:90
 mac2: 50:6b:4b:6a:ec:91
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: down
-    type: ethernet
-    
-  - name: eth1
-    mac: "{{ mac1 }}"
-    state: up
-    type: ethernet
-    autoconnect: yes
-    ip:
-      address: 
-      - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}"
-      gateway4: "{{ eth1_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: down
+  type: ethernet
   
-  - name: eth2
-    mac: "{{ mac2 }}"
-    state: down
-    type: ethernet   
+- name: eth1
+  mac: "{{ mac1 }}"
+  state: up
+  type: ethernet
+  autoconnect: yes
+  ip:
+    address: 
+    - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}"
+    gateway4: "{{ eth1_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+
+- name: eth2
+  mac: "{{ mac2 }}"
+  state: down
+  type: ethernet   
   
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-a64-03.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-03.iad2.fedoraproject.org
index 332345c050..6d80c0200f 100644
--- a/inventory/host_vars/buildhw-a64-03.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-a64-03.iad2.fedoraproject.org
@@ -16,35 +16,34 @@ mac2: e6:6d:96:cc:7a:cd
 mac3: d2:87:2a:46:d0:24
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
-
-  - name: eth1
-    mac: "{{ mac1 }}"
-    state: down
-    type: ethernet
-    autoconnect: yes
-      
-  - name: eth2
-    mac: "{{ mac2 }}"
-    state: down
-    type: ethernet
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth1
+  mac: "{{ mac1 }}"
+  state: down
+  type: ethernet
+  autoconnect: yes
     
-  - name: eth3
-    mac: "{{ mac3 }}"
-    state: down
-    type: ethernet
\ No newline at end of file
+- name: eth2
+  mac: "{{ mac2 }}"
+  state: down
+  type: ethernet
+  
+- name: eth3
+  mac: "{{ mac3 }}"
+  state: down
+  type: ethernet
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-a64-04.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-04.iad2.fedoraproject.org
index 8702474601..e3933a17d3 100644
--- a/inventory/host_vars/buildhw-a64-04.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-a64-04.iad2.fedoraproject.org
@@ -16,35 +16,34 @@ mac2: da:2c:8f:e7:99:2b
 mac3: c2:ac:ba:0d:8c:db
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
-
-  - name: eth1
-    mac: "{{ mac1 }}"
-    state: down
-    type: ethernet
-    autoconnect: yes
-    
-  - name: eth2
-    mac: "{{ mac2 }}"
-    state: down
-    type: ethernet
-    
-  - name: eth3
-    mac: "{{ mac3 }}"
-    state: down
-    type: ethernet
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth1
+  mac: "{{ mac1 }}"
+  state: down
+  type: ethernet
+  autoconnect: yes
+  
+- name: eth2
+  mac: "{{ mac2 }}"
+  state: down
+  type: ethernet
+  
+- name: eth3
+  mac: "{{ mac3 }}"
+  state: down
+  type: ethernet
diff --git a/inventory/host_vars/buildhw-a64-05.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-05.iad2.fedoraproject.org
index 5a61b72288..ca9e67839b 100644
--- a/inventory/host_vars/buildhw-a64-05.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-a64-05.iad2.fedoraproject.org
@@ -16,35 +16,35 @@ mac2: f2:b7:9e:26:0d:9a
 mac3: ca:65:7a:c4:c8:83
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
 
-  - name: eth1
-    mac: "{{ mac1 }}"
-    state: down
-    type: ethernet
-    autoconnect: yes
- 
-  - name: eth2
-    mac: "{{ mac2 }}"
-    state: down
-    type: ethernet
-    
-  - name: eth3
-    mac: "{{ mac3 }}"
-    state: down
-    type: ethernet
+- name: eth1
+  mac: "{{ mac1 }}"
+  state: down
+  type: ethernet
+  autoconnect: yes
+
+- name: eth2
+  mac: "{{ mac2 }}"
+  state: down
+  type: ethernet
+  
+- name: eth3
+  mac: "{{ mac3 }}"
+  state: down
+  type: ethernet
diff --git a/inventory/host_vars/buildhw-a64-06.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-06.iad2.fedoraproject.org
index 0a31988d62..8c099c0e93 100644
--- a/inventory/host_vars/buildhw-a64-06.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-a64-06.iad2.fedoraproject.org
@@ -16,35 +16,34 @@ mac2: 66:19:15:4e:89:56
 mac3: 66:66:16:e5:59:df
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth1
+  mac: "{{ mac1 }}"
+  state: down
+  type: ethernet
+  autoconnect: yes
 
-  - name: eth1
-    mac: "{{ mac1 }}"
-    state: down
-    type: ethernet
-    autoconnect: yes
- 
-  - name: eth2
-    mac: "{{ mac2 }}"
-    state: down
-    type: ethernet
-    
-  - name: eth3
-    mac: "{{ mac3 }}"
-    state: down
-    type: ethernet
\ No newline at end of file
+- name: eth2
+  mac: "{{ mac2 }}"
+  state: down
+  type: ethernet
+  
+- name: eth3
+  mac: "{{ mac3 }}"
+  state: down
+  type: ethernet
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-a64-11.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-11.iad2.fedoraproject.org
index f5fb44334d..df1b0bc071 100644
--- a/inventory/host_vars/buildhw-a64-11.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-a64-11.iad2.fedoraproject.org
@@ -16,35 +16,34 @@ mac2: 8a:93:68:8d:ca:cd
 mac3: ee:ef:b7:b9:28:8a
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth1
+  mac: "{{ mac1 }}"
+  state: down
+  type: ethernet
+  autoconnect: yes
 
-  - name: eth1
-    mac: "{{ mac1 }}"
-    state: down
-    type: ethernet
-    autoconnect: yes
- 
-  - name: eth2
-    mac: "{{ mac2 }}"
-    state: down
-    type: ethernet
-    
-  - name: eth3
-    mac: "{{ mac3 }}"
-    state: down
-    type: ethernet
+- name: eth2
+  mac: "{{ mac2 }}"
+  state: down
+  type: ethernet
+  
+- name: eth3
+  mac: "{{ mac3 }}"
+  state: down
+  type: ethernet
diff --git a/inventory/host_vars/buildhw-a64-19.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-19.iad2.fedoraproject.org
index bdc72eddf6..895aa8f9ce 100644
--- a/inventory/host_vars/buildhw-a64-19.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-a64-19.iad2.fedoraproject.org
@@ -16,35 +16,34 @@ mac2: f4:e9:d4:f2:e7:f4
 mac3: f4:e9:d4:f2:e7:f5 
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth1
+  mac: "{{ mac1 }}"
+  state: down
+  type: ethernet
+  autoconnect: yes
 
-  - name: eth1
-    mac: "{{ mac1 }}"
-    state: down
-    type: ethernet
-    autoconnect: yes
- 
-  - name: eth2
-    mac: "{{ mac2 }}"
-    state: down
-    type: ethernet
-    
-  - name: eth3
-    mac: "{{ mac3 }}"
-    state: down
-    type: ethernet
+- name: eth2
+  mac: "{{ mac2 }}"
+  state: down
+  type: ethernet
+  
+- name: eth3
+  mac: "{{ mac3 }}"
+  state: down
+  type: ethernet
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-a64-20.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-20.iad2.fedoraproject.org
index 023ee9c2e8..9b70f7b4c8 100644
--- a/inventory/host_vars/buildhw-a64-20.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-a64-20.iad2.fedoraproject.org
@@ -16,35 +16,34 @@ mac2: f4:e9:d4:f2:e9:6e
 mac3: f4:e9:d4:f2:e9:6f 
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth1
+  mac: "{{ mac1 }}"
+  state: down
+  type: ethernet
+  autoconnect: yes
 
-  - name: eth1
-    mac: "{{ mac1 }}"
-    state: down
-    type: ethernet
-    autoconnect: yes
- 
-  - name: eth2
-    mac: "{{ mac2 }}"
-    state: down
-    type: ethernet
-    
-  - name: eth3
-    mac: "{{ mac3 }}"
-    state: down
-    type: ethernet
\ No newline at end of file
+- name: eth2
+  mac: "{{ mac2 }}"
+  state: down
+  type: ethernet
+  
+- name: eth3
+  mac: "{{ mac3 }}"
+  state: down
+  type: ethernet
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-a64-21.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-21.iad2.fedoraproject.org
index 5ed37b0ced..64474353a9 100644
--- a/inventory/host_vars/buildhw-a64-21.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-a64-21.iad2.fedoraproject.org
@@ -16,28 +16,28 @@ mac1: 50:6b:4b:6a:b6:20
 mac2: 50:6b:4b:6a:b6:21
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    type: ethernet
-    autoconnect: no
-  - name: eth1
-    state: up
-    type: ethernet
-    autoconnect: yes
-    mac: "{{ mac1 }}"
-    ip:
-      address: 
-      - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}"
-      gateway4: "{{ eth1_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
-  - name: eth2
-    mac: "{{ mac2 }}"
-    type: ethernet
-    autoconnect: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  type: ethernet
+  autoconnect: no
+- name: eth1
+  state: up
+  type: ethernet
+  autoconnect: yes
+  mac: "{{ mac1 }}"
+  ip:
+    address: 
+    - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}"
+    gateway4: "{{ eth1_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth2
+  mac: "{{ mac2 }}"
+  type: ethernet
+  autoconnect: no
diff --git a/inventory/host_vars/buildhw-a64-22.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-22.iad2.fedoraproject.org
index d7821744d3..50aaa0d399 100644
--- a/inventory/host_vars/buildhw-a64-22.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-a64-22.iad2.fedoraproject.org
@@ -16,28 +16,28 @@ mac1: 50:6b:4b:6a:eb:b0
 mac2: 50:6b:4b:6a:eb:b1
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    type: ethernet
-    autoconnect: no
-  - name: eth1
-    state: up
-    type: ethernet
-    autoconnect: yes
-    mac: "{{ mac1 }}"
-    ip:
-      address: 
-      - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}"
-      gateway4: "{{ eth1_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
-  - name: eth2
-    mac: "{{ mac2 }}"
-    type: ethernet
-    autoconnect: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  type: ethernet
+  autoconnect: no
+- name: eth1
+  state: up
+  type: ethernet
+  autoconnect: yes
+  mac: "{{ mac1 }}"
+  ip:
+    address: 
+    - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}"
+    gateway4: "{{ eth1_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth2
+  mac: "{{ mac2 }}"
+  type: ethernet
+  autoconnect: no
diff --git a/inventory/host_vars/buildhw-a64-23.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-23.iad2.fedoraproject.org
index 2ce060982d..01923b4d21 100644
--- a/inventory/host_vars/buildhw-a64-23.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-a64-23.iad2.fedoraproject.org
@@ -16,28 +16,28 @@ mac1: 50:6b:4b:6a:ea:60
 mac2: 50:6b:4b:6a:ea:61
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    type: ethernet
-    autoconnect: no
-  - name: eth1
-    state: up
-    type: ethernet
-    autoconnect: yes
-    mac: "{{ mac1 }}"
-    ip:
-      address: 
-      - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}"
-      gateway4: "{{ eth1_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
-  - name: eth2
-    mac: "{{ mac2 }}"
-    type: ethernet
-    autoconnect: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  type: ethernet
+  autoconnect: no
+- name: eth1
+  state: up
+  type: ethernet
+  autoconnect: yes
+  mac: "{{ mac1 }}"
+  ip:
+    address: 
+    - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}"
+    gateway4: "{{ eth1_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth2
+  mac: "{{ mac2 }}"
+  type: ethernet
+  autoconnect: no
diff --git a/inventory/host_vars/buildhw-a64-24.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-24.iad2.fedoraproject.org
index fdafcc5365..8bb913e55a 100644
--- a/inventory/host_vars/buildhw-a64-24.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-a64-24.iad2.fedoraproject.org
@@ -16,28 +16,28 @@ mac1: 50:6B:4B:6A:C4:90
 mac2: 50:6B:4B:6A:C4:91
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    type: ethernet
-    autoconnect: no
-  - name: eth1
-    state: up
-    type: ethernet
-    autoconnect: yes
-    mac: "{{ mac1 }}"
-    ip:
-      address: 
-      - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}"
-      gateway4: "{{ eth1_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
-  - name: eth2
-    mac: "{{ mac2 }}"
-    type: ethernet
-    autoconnect: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  type: ethernet
+  autoconnect: no
+- name: eth1
+  state: up
+  type: ethernet
+  autoconnect: yes
+  mac: "{{ mac1 }}"
+  ip:
+    address: 
+    - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}"
+    gateway4: "{{ eth1_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth2
+  mac: "{{ mac2 }}"
+  type: ethernet
+  autoconnect: no
diff --git a/inventory/host_vars/buildhw-x86-01.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-01.iad2.fedoraproject.org
index 1f1c58ba13..5a17f3b037 100644
--- a/inventory/host_vars/buildhw-x86-01.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-01.iad2.fedoraproject.org
@@ -13,20 +13,20 @@ mac0: 14:9e:cf:61:9e:61
 mac1: 14:9e:cf:61:9e:64 
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    autoconnect: yes
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      dhcp4: no
-      auto6: no
-  - name: eth1
-    mac: "{{ mac1 }}"
-    state: down
-    type: ethernet
\ No newline at end of file
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  autoconnect: yes
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    dhcp4: no
+    auto6: no
+- name: eth1
+  mac: "{{ mac1 }}"
+  state: down
+  type: ethernet
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-x86-02.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-02.iad2.fedoraproject.org
index 97d9920fdd..fa6b34a68a 100644
--- a/inventory/host_vars/buildhw-x86-02.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-02.iad2.fedoraproject.org
@@ -14,25 +14,24 @@ mac0: 14:9e:cf:61:9e:61
 mac1: 14:9e:cf:61:9e:64
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
-
-  - name: eth1
-    mac: "{{ mac1 }}"
-    state: down
-    type: ethernet
-    autoconnect: yes
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth1
+  mac: "{{ mac1 }}"
+  state: down
+  type: ethernet
+  autoconnect: yes
diff --git a/inventory/host_vars/buildhw-x86-03.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-03.iad2.fedoraproject.org
index 9a6dae2b97..903fcab131 100644
--- a/inventory/host_vars/buildhw-x86-03.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-03.iad2.fedoraproject.org
@@ -14,25 +14,24 @@ mac0: 14:9e:cf:61:9e:c9
 mac1: 14:9e:cf:61:9e:cc
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
-
-  - name: eth1
-    mac: "{{ mac1 }}"
-    state: down
-    type: ethernet
-    autoconnect: yes
\ No newline at end of file
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth1
+  mac: "{{ mac1 }}"
+  state: down
+  type: ethernet
+  autoconnect: yes
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-x86-04.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-04.iad2.fedoraproject.org
index 1e4ac3bd6a..5a7b304308 100644
--- a/inventory/host_vars/buildhw-x86-04.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-04.iad2.fedoraproject.org
@@ -14,25 +14,24 @@ mac0: 14:9e:cf:61:a5:07
 mac1: 14:9e:cf:61:a5:0a
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
-
-  - name: eth1
-    mac: "{{ mac1 }}"
-    state: down
-    type: ethernet
-    autoconnect: yes
\ No newline at end of file
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth1
+  mac: "{{ mac1 }}"
+  state: down
+  type: ethernet
+  autoconnect: yes
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-x86-06.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-06.iad2.fedoraproject.org
index 6bdb176249..011877055a 100644
--- a/inventory/host_vars/buildhw-x86-06.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-06.iad2.fedoraproject.org
@@ -15,25 +15,24 @@ mac1: 14:9e:cf:61:a0:c0
 
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
-
-  - name: eth1
-    mac: "{{ mac1 }}"
-    state: down
-    type: ethernet
-    autoconnect: yes
\ No newline at end of file
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth1
+  mac: "{{ mac1 }}"
+  state: down
+  type: ethernet
+  autoconnect: yes
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-x86-07.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-07.iad2.fedoraproject.org
index 07f8d81438..f5c20c33a6 100644
--- a/inventory/host_vars/buildhw-x86-07.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-07.iad2.fedoraproject.org
@@ -14,25 +14,24 @@ mac0: 14:9e:cf:61:9e:e3
 mac1: 14:9e:cf:61:9e:e6 
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
-
-  - name: eth1
-    mac: "{{ mac1 }}"
-    state: down
-    type: ethernet
-    autoconnect: yes
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth1
+  mac: "{{ mac1 }}"
+  state: down
+  type: ethernet
+  autoconnect: yes
diff --git a/inventory/host_vars/buildhw-x86-08.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-08.iad2.fedoraproject.org
index e2f04c570c..667aebef1d 100644
--- a/inventory/host_vars/buildhw-x86-08.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-08.iad2.fedoraproject.org
@@ -14,26 +14,25 @@ mac0: 14:9e:cf:61:a6:75
 mac1: 14:9e:cf:61:a6:78 
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
-
-  - name: eth1
-    mac: "{{ mac1 }}"
-    state: down
-    type: ethernet
-    autoconnect: yes
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth1
+  mac: "{{ mac1 }}"
+  state: down
+  type: ethernet
+  autoconnect: yes
  
diff --git a/inventory/host_vars/buildhw-x86-09.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-09.iad2.fedoraproject.org
index 1adff796d4..b0f94e0ff9 100644
--- a/inventory/host_vars/buildhw-x86-09.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-09.iad2.fedoraproject.org
@@ -14,25 +14,24 @@ mac0: f8:ca:b8:f7:26:e1
 mac1: f8:ca:b8:f7:26:e4 
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
-
-  - name: eth1
-    mac: "{{ mac1 }}"
-    state: down
-    type: ethernet
-    autoconnect: yes
\ No newline at end of file
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth1
+  mac: "{{ mac1 }}"
+  state: down
+  type: ethernet
+  autoconnect: yes
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-x86-10.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-10.iad2.fedoraproject.org
index 66eae94900..0ba0524f39 100644
--- a/inventory/host_vars/buildhw-x86-10.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-10.iad2.fedoraproject.org
@@ -14,25 +14,24 @@ mac0: f8:ca:b8:f7:27:cf
 mac1: f8:ca:b8:f7:27:d2
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
-
-  - name: eth1
-    mac: "{{ mac1 }}"
-    state: down
-    type: ethernet
-    autoconnect: yes
\ No newline at end of file
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth1
+  mac: "{{ mac1 }}"
+  state: down
+  type: ethernet
+  autoconnect: yes
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-x86-11.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-11.iad2.fedoraproject.org
index 54cd66ab8f..8a50779948 100644
--- a/inventory/host_vars/buildhw-x86-11.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-11.iad2.fedoraproject.org
@@ -14,25 +14,24 @@ mac0: f8:ca:b8:f7:27:63
 mac1: f8:ca:b8:f7:27:66
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
-
-  - name: eth1
-    mac: "{{ mac1 }}"
-    state: down
-    type: ethernet
-    autoconnect: yes
\ No newline at end of file
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth1
+  mac: "{{ mac1 }}"
+  state: down
+  type: ethernet
+  autoconnect: yes
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-x86-12.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-12.iad2.fedoraproject.org
index f5c4bb2bdb..3a85918ab3 100644
--- a/inventory/host_vars/buildhw-x86-12.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-12.iad2.fedoraproject.org
@@ -14,25 +14,24 @@ mac0: f8:ca:b8:f7:2e:f5
 mac1: f8:ca:b8:f7:2e:f8
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
-
-  - name: eth1
-    mac: "{{ mac1 }}"
-    state: down
-    type: ethernet
-    autoconnect: yes
\ No newline at end of file
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth1
+  mac: "{{ mac1 }}"
+  state: down
+  type: ethernet
+  autoconnect: yes
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-x86-13.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-13.iad2.fedoraproject.org
index c9f7898013..511c8a2872 100644
--- a/inventory/host_vars/buildhw-x86-13.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-13.iad2.fedoraproject.org
@@ -14,25 +14,24 @@ mac0: f8:ca:b8:f7:27:49
 mac1: f8:ca:b8:f7:27:4c
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
-
-  - name: eth1
-    mac: "{{ mac1 }}"
-    state: down
-    type: ethernet
-    autoconnect: yes
\ No newline at end of file
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth1
+  mac: "{{ mac1 }}"
+  state: down
+  type: ethernet
+  autoconnect: yes
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-x86-14.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-14.iad2.fedoraproject.org
index b19640f90e..526fa3bc46 100644
--- a/inventory/host_vars/buildhw-x86-14.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-14.iad2.fedoraproject.org
@@ -14,25 +14,24 @@ mac0: f8:ca:b8:f7:2d:87
 mac1: f8:ca:b8:f7:2d:8a
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
-
-  - name: eth1
-    mac: "{{ mac1 }}"
-    state: down
-    type: ethernet
-    autoconnect: yes
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth1
+  mac: "{{ mac1 }}"
+  state: down
+  type: ethernet
+  autoconnect: yes
diff --git a/inventory/host_vars/buildhw-x86-15.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-15.iad2.fedoraproject.org
index 31c9de11b9..85d216b8c2 100644
--- a/inventory/host_vars/buildhw-x86-15.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-15.iad2.fedoraproject.org
@@ -14,25 +14,24 @@ mac0: f8:ca:b8:f7:26:fb
 mac1: f8:ca:b8:f7:26:fe
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
-
-  - name: eth1
-    mac: "{{ mac1 }}"
-    state: down
-    type: ethernet
-    autoconnect: yes
\ No newline at end of file
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth1
+  mac: "{{ mac1 }}"
+  state: down
+  type: ethernet
+  autoconnect: yes
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-x86-16.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-16.iad2.fedoraproject.org
index 5443aba20f..7a47d235f4 100644
--- a/inventory/host_vars/buildhw-x86-16.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-16.iad2.fedoraproject.org
@@ -14,25 +14,24 @@ mac0: f8:ca:b8:f7:29:3d
 mac1: f8:ca:b8:f7:29:40
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
-
-  - name: eth1
-    mac: "{{ mac1 }}"
-    state: down
-    type: ethernet
-    autoconnect: yes
\ No newline at end of file
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
+- name: eth1
+  mac: "{{ mac1 }}"
+  state: down
+  type: ethernet
+  autoconnect: yes
\ No newline at end of file
diff --git a/inventory/host_vars/buildvm-a32-01.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-01.iad2.fedoraproject.org
index 3b002757bb..c7d2f318e9 100644
--- a/inventory/host_vars/buildvm-a32-01.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-01.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:0d:2c:f0
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
\ No newline at end of file
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
\ No newline at end of file
diff --git a/inventory/host_vars/buildvm-a32-01.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-01.stg.iad2.fedoraproject.org
index 71ab7a7567..6b98c1a399 100644
--- a/inventory/host_vars/buildvm-a32-01.stg.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-01.stg.iad2.fedoraproject.org
@@ -15,19 +15,19 @@ has_ipv6: no
 mac0: 52:54:00:d7:04:aa
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a32-02.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-02.iad2.fedoraproject.org
index 4a08f8843f..20bd47084f 100644
--- a/inventory/host_vars/buildvm-a32-02.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-02.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:ac:8e:53
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a32-02.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-02.stg.iad2.fedoraproject.org
index 4924a2cfae..15a1c07707 100644
--- a/inventory/host_vars/buildvm-a32-02.stg.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-02.stg.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:ac:8e:53
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a32-03.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-03.iad2.fedoraproject.org
index 4451566483..3f1d0bab57 100644
--- a/inventory/host_vars/buildvm-a32-03.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-03.iad2.fedoraproject.org
@@ -14,20 +14,20 @@ has_ipv6: no
 mac0: 52:54:00:c3:fb:32
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
 
diff --git a/inventory/host_vars/buildvm-a32-04.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-04.iad2.fedoraproject.org
index 0b33f97214..4130e78ba2 100644
--- a/inventory/host_vars/buildvm-a32-04.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-04.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:5c:f6:d2
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a32-05.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-05.iad2.fedoraproject.org
index f4368afbd9..744c3dad97 100644
--- a/inventory/host_vars/buildvm-a32-05.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-05.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:d7:98:00
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a32-06.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-06.iad2.fedoraproject.org
index 5acc68b58a..507f5113f6 100644
--- a/inventory/host_vars/buildvm-a32-06.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-06.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:de:fc:9e
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
\ No newline at end of file
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
\ No newline at end of file
diff --git a/inventory/host_vars/buildvm-a32-07.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-07.iad2.fedoraproject.org
index 472cd8f0cb..ab48a2b689 100644
--- a/inventory/host_vars/buildvm-a32-07.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-07.iad2.fedoraproject.org
@@ -14,20 +14,20 @@ has_ipv6: no
 mac0: 52:54:00:5d:9e:16
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
       
\ No newline at end of file
diff --git a/inventory/host_vars/buildvm-a32-08.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-08.iad2.fedoraproject.org
index bd0bb0ebbe..8862d3e2d9 100644
--- a/inventory/host_vars/buildvm-a32-08.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-08.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:08:bd:f4
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a32-09.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-09.iad2.fedoraproject.org
index 231e76beda..7358cc46c3 100644
--- a/inventory/host_vars/buildvm-a32-09.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-09.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:e5:6a:68
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
\ No newline at end of file
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
\ No newline at end of file
diff --git a/inventory/host_vars/buildvm-a32-10.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-10.iad2.fedoraproject.org
index d7854688e9..7e80b94a3e 100644
--- a/inventory/host_vars/buildvm-a32-10.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-10.iad2.fedoraproject.org
@@ -14,20 +14,20 @@ has_ipv6: no
 mac0: 52:54:00:e7:6f:ed
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
 
diff --git a/inventory/host_vars/buildvm-a32-11.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-11.iad2.fedoraproject.org
index b5941ad6ad..49ecf79afd 100644
--- a/inventory/host_vars/buildvm-a32-11.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-11.iad2.fedoraproject.org
@@ -14,20 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:18:90:20
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
-
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a32-12.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-12.iad2.fedoraproject.org
index 6da4e49cf0..599fe8ced3 100644
--- a/inventory/host_vars/buildvm-a32-12.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-12.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:23:d9:c7
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a32-13.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-13.iad2.fedoraproject.org
index ada3216314..86ed46a70f 100644
--- a/inventory/host_vars/buildvm-a32-13.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-13.iad2.fedoraproject.org
@@ -14,20 +14,20 @@ has_ipv6: no
 mac0: 52:54:00:67:17:ea
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
 
diff --git a/inventory/host_vars/buildvm-a32-14.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-14.iad2.fedoraproject.org
index 2d3a774b8d..a346c3cc93 100644
--- a/inventory/host_vars/buildvm-a32-14.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-14.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:28:be:1a
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a32-15.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-15.iad2.fedoraproject.org
index 58d6834612..9fe322024b 100644
--- a/inventory/host_vars/buildvm-a32-15.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-15.iad2.fedoraproject.org
@@ -14,20 +14,20 @@ has_ipv6: no
 mac0: 52:54:00:52:1c:61
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
 
diff --git a/inventory/host_vars/buildvm-a32-16.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-16.iad2.fedoraproject.org
index 898d10fe64..b6742c5801 100644
--- a/inventory/host_vars/buildvm-a32-16.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-16.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:34:95:28 
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a32-17.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-17.iad2.fedoraproject.org
index 60731fa37b..2b1e9366bd 100644
--- a/inventory/host_vars/buildvm-a32-17.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-17.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:6c:d2:9d
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
\ No newline at end of file
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
\ No newline at end of file
diff --git a/inventory/host_vars/buildvm-a32-18.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-18.iad2.fedoraproject.org
index bdc8bf2f89..68cbcd60ef 100644
--- a/inventory/host_vars/buildvm-a32-18.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-18.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:f9:13:e4
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a32-19.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-19.iad2.fedoraproject.org
index 78d95ea32a..ee132a92eb 100644
--- a/inventory/host_vars/buildvm-a32-19.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-19.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:2d:53:c8
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a32-20.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-20.iad2.fedoraproject.org
index 452cfa55f8..a11620f117 100644
--- a/inventory/host_vars/buildvm-a32-20.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-20.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:b6:5e:eb
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a32-21.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-21.iad2.fedoraproject.org
index 44ac8260ac..a5bdb9f0e6 100644
--- a/inventory/host_vars/buildvm-a32-21.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-21.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:67:c4:5b
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a32-22.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-22.iad2.fedoraproject.org
index 3ca25b1290..5e5c476d7a 100644
--- a/inventory/host_vars/buildvm-a32-22.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-22.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:77:e0:9d
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a32-23.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-23.iad2.fedoraproject.org
index 5aedb54340..7255116705 100644
--- a/inventory/host_vars/buildvm-a32-23.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-23.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:59:40:a8
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a32-24.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-24.iad2.fedoraproject.org
index aa96e45b36..43a832ee3e 100644
--- a/inventory/host_vars/buildvm-a32-24.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-24.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:d3:91:61
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a32-25.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-25.iad2.fedoraproject.org
index 0b97b35461..ce9d2f8347 100644
--- a/inventory/host_vars/buildvm-a32-25.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-25.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:fa:fc:dd 
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a32-26.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-26.iad2.fedoraproject.org
index 96767fe60b..311bc9c21c 100644
--- a/inventory/host_vars/buildvm-a32-26.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-26.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:43:98:b2 
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a32-27.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-27.iad2.fedoraproject.org
index 948e8881f2..2f74644a93 100644
--- a/inventory/host_vars/buildvm-a32-27.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-27.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:ef:19:17
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a32-31.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-31.iad2.fedoraproject.org
index a342d63c8a..2c7f69f3b1 100644
--- a/inventory/host_vars/buildvm-a32-31.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-31.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:9e:67:92
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a32-32.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-32.iad2.fedoraproject.org
index ec16252b2e..25e0376a47 100644
--- a/inventory/host_vars/buildvm-a32-32.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-32.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:48:3e:a3
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a32-33.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-33.iad2.fedoraproject.org
index eb6b2bf26e..b405015eb3 100644
--- a/inventory/host_vars/buildvm-a32-33.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-33.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:ec:06:17
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a64-01.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-01.iad2.fedoraproject.org
index 11e0abc1a6..a27159b04d 100644
--- a/inventory/host_vars/buildvm-a64-01.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-01.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:a0:23:2f
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
\ No newline at end of file
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
\ No newline at end of file
diff --git a/inventory/host_vars/buildvm-a64-01.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-01.stg.iad2.fedoraproject.org
index 6f4e761524..4348205162 100644
--- a/inventory/host_vars/buildvm-a64-01.stg.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-01.stg.iad2.fedoraproject.org
@@ -14,20 +14,20 @@ has_ipv6: no
 mac0: 52:54:00:2f:20:0d
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
 
diff --git a/inventory/host_vars/buildvm-a64-02.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-02.iad2.fedoraproject.org
index fd5c807939..9798b39a8b 100644
--- a/inventory/host_vars/buildvm-a64-02.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-02.iad2.fedoraproject.org
@@ -14,20 +14,20 @@ has_ipv6: no
 mac0: 52:54:00:81:4c:e8
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
 
diff --git a/inventory/host_vars/buildvm-a64-02.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-02.stg.iad2.fedoraproject.org
index eb98ccf635..416f9051cf 100644
--- a/inventory/host_vars/buildvm-a64-02.stg.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-02.stg.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:2b:1d:73
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a64-03.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-03.iad2.fedoraproject.org
index 087d201c01..c4619a7342 100644
--- a/inventory/host_vars/buildvm-a64-03.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-03.iad2.fedoraproject.org
@@ -14,20 +14,20 @@ has_ipv6: no
 mac0: 52:54:00:9c:4e:9d 
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
 
diff --git a/inventory/host_vars/buildvm-a64-04.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-04.iad2.fedoraproject.org
index 1619f228e2..40a9a50de0 100644
--- a/inventory/host_vars/buildvm-a64-04.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-04.iad2.fedoraproject.org
@@ -14,20 +14,20 @@ has_ipv6: no
 mac0: 52:54:00:4f:50:9f
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
 
diff --git a/inventory/host_vars/buildvm-a64-05.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-05.iad2.fedoraproject.org
index b3a96e5479..7145a6b54e 100644
--- a/inventory/host_vars/buildvm-a64-05.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-05.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:d8:ce:90 
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a64-06.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-06.iad2.fedoraproject.org
index 9aa9159e4d..0696a5b528 100644
--- a/inventory/host_vars/buildvm-a64-06.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-06.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:56:00:ac  
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a64-07.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-07.iad2.fedoraproject.org
index e188617bab..c0a0fdd749 100644
--- a/inventory/host_vars/buildvm-a64-07.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-07.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:3d:74:dc  
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a64-08.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-08.iad2.fedoraproject.org
index 862f484c2e..a2b9ea1d29 100644
--- a/inventory/host_vars/buildvm-a64-08.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-08.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:20:d4:4b  
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
\ No newline at end of file
diff --git a/inventory/host_vars/buildvm-a64-09.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-09.iad2.fedoraproject.org
index 067be6125f..f1e9775e51 100644
--- a/inventory/host_vars/buildvm-a64-09.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-09.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:c8:74:89  
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a64-10.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-10.iad2.fedoraproject.org
index b7626b1517..74df7f9454 100644
--- a/inventory/host_vars/buildvm-a64-10.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-10.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:fa:fe:fd  
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a64-11.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-11.iad2.fedoraproject.org
index be30499aff..570062d992 100644
--- a/inventory/host_vars/buildvm-a64-11.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-11.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:79:6d:b9  
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a64-12.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-12.iad2.fedoraproject.org
index 4adf80b131..790cea9208 100644
--- a/inventory/host_vars/buildvm-a64-12.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-12.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:54:7f:f2 
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a64-13.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-13.iad2.fedoraproject.org
index 31eef20d2f..83f45d9968 100644
--- a/inventory/host_vars/buildvm-a64-13.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-13.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:6c:e5:84
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a64-14.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-14.iad2.fedoraproject.org
index 851a325e72..72e22d371d 100644
--- a/inventory/host_vars/buildvm-a64-14.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-14.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:70:9d:8d
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a64-15.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-15.iad2.fedoraproject.org
index 8c06e32f01..29eb2f4a7a 100644
--- a/inventory/host_vars/buildvm-a64-15.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-15.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:e4:02:9f
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a64-16.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-16.iad2.fedoraproject.org
index 2301826b1e..ca79a11b85 100644
--- a/inventory/host_vars/buildvm-a64-16.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-16.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:92:3b:d3
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a64-17.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-17.iad2.fedoraproject.org
index b22303cb6c..f77f183d8b 100644
--- a/inventory/host_vars/buildvm-a64-17.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-17.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:26:84:9e 
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a64-18.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-18.iad2.fedoraproject.org
index 908a16cf6f..43c48f7340 100644
--- a/inventory/host_vars/buildvm-a64-18.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-18.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:14:25:7b
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a64-19.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-19.iad2.fedoraproject.org
index 73dbcb1ceb..1e77877075 100644
--- a/inventory/host_vars/buildvm-a64-19.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-19.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:fa:b9:23 
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a64-20.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-20.iad2.fedoraproject.org
index 3893188022..65ca836cf8 100644
--- a/inventory/host_vars/buildvm-a64-20.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-20.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:7e:9a:f1
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a64-21.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-21.iad2.fedoraproject.org
index ea07075971..c987b16d43 100644
--- a/inventory/host_vars/buildvm-a64-21.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-21.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:f9:49:c1
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a64-22.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-22.iad2.fedoraproject.org
index 392e71cf43..4645ed8f5f 100644
--- a/inventory/host_vars/buildvm-a64-22.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-22.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:cf:2b:93
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no
diff --git a/inventory/host_vars/buildvm-a64-23.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-23.iad2.fedoraproject.org
index db0dd42953..d4aaaec5f9 100644
--- a/inventory/host_vars/buildvm-a64-23.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-23.iad2.fedoraproject.org
@@ -14,19 +14,19 @@ has_ipv6: no
 mac0: 52:54:00:4f:f7:ce 
 
 network_connections:
-  - name: eth0
-    mac: "{{ mac0 }}"
-    state: up
-    type: ethernet
-    ip:
-      address: 
-      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      dns: 
-      - "{{ dns1 }}"
-      - "{{ dns2 }}"
-      dns_search: 
-      - iad2.fedoraproject.org
-      - fedoraproject.org
-      dhcp4: no
-      auto6: no
+- name: eth0
+  mac: "{{ mac0 }}"
+  state: up
+  type: ethernet
+  ip:
+    address: 
+    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+    gateway4: "{{ eth0_ipv4_gw }}"
+    dns: 
+    - "{{ dns1 }}"
+    - "{{ dns2 }}"
+    dns_search: 
+    - iad2.fedoraproject.org
+    - fedoraproject.org
+    dhcp4: no
+    auto6: no