diff --git a/inventory/hardware b/inventory/hardware index d063cfb4e4..9e47daa44f 100644 --- a/inventory/hardware +++ b/inventory/hardware @@ -40,9 +40,7 @@ bvmhost-x86-06.iad2.fedoraproject.org bvmhost-x86-07.iad2.fedoraproject.org bvmhost-x86-08.iad2.fedoraproject.org bvmhost-x86-01.stg.iad2.fedoraproject.org -bvmhost-x86-02.stg.iad2.fedoraproject.org bvmhost-x86-03.stg.iad2.fedoraproject.org -bvmhost-x86-04.stg.iad2.fedoraproject.org bvmhost-x86-05.stg.iad2.fedoraproject.org ## bkernel01.iad2.fedoraproject.org @@ -58,7 +56,6 @@ openqa-x86-worker05.iad2.fedoraproject.org openqa-x86-worker06.iad2.fedoraproject.org ## Virt vmhost-x86-01.iad2.fedoraproject.org -vmhost-x86-01.stg.iad2.fedoraproject.org vmhost-x86-02.iad2.fedoraproject.org vmhost-x86-02.stg.iad2.fedoraproject.org vmhost-x86-03.iad2.fedoraproject.org @@ -72,8 +69,6 @@ vmhost-x86-06.stg.iad2.fedoraproject.org vmhost-x86-07.iad2.fedoraproject.org vmhost-x86-07.stg.iad2.fedoraproject.org vmhost-x86-08.stg.iad2.fedoraproject.org -vmhost-x86-09.stg.iad2.fedoraproject.org -vmhost-x86-10.stg.iad2.fedoraproject.org vmhost-x86-11.stg.iad2.fedoraproject.org vmhost-x86-12.stg.iad2.fedoraproject.org worker01.ocp.iad2.fedoraproject.org diff --git a/inventory/host_vars/bvmhost-x86-02.stg.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-02.stg.iad2.fedoraproject.org deleted file mode 100644 index 65f8ef1a80..0000000000 --- a/inventory/host_vars/bvmhost-x86-02.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,40 +0,0 @@ ---- -br0_ipv4: 10.3.167.12 -br0_ipv4_gw: 10.3.167.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -has_ipv4: yes -mac1: ec:f4:bb:d9:56:10 -mac2: ec:f4:bb:d9:56:12 -mac3: ec:f4:bb:d9:56:14 -mac4: ec:f4:bb:d9:56:15 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/bvmhost-x86-04.stg.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-04.stg.iad2.fedoraproject.org deleted file mode 100644 index 58ac96bd03..0000000000 --- a/inventory/host_vars/bvmhost-x86-04.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,44 +0,0 @@ ---- -# This virthost only has stg instances, so it doesn't freeze -br0_ipv4: 10.3.167.14 -br0_ipv4_gw: 10.3.167.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -freezes: false -has_ipv4: yes -mac1: EC:F4:BB:D2:8F:00 -mac2: EC:F4:BB:D2:8F:02 -mac3: EC:F4:BB:D2:8F:04 -mac4: EC:F4:BB:D2:8F:05 -mgmt_ipv4: 10.3.160.199 -mgmt_mac: "B8:2A:72:FC:EE:68" -nested: true -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/vmhost-x86-01.stg.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-01.stg.iad2.fedoraproject.org deleted file mode 100644 index ad8c52c722..0000000000 --- a/inventory/host_vars/vmhost-x86-01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,48 +0,0 @@ ---- -# This virthost only has stg instances, so it doesn't freeze -br0_ipv4: 10.3.166.11 -br0_ipv4_gw: 10.3.166.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac3 }}" -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -freezes: false -has_ipv4: yes -# Inside this, expect /vmlinuz and /initrd.img -install_binpath: /uefi/x86_64/el8 -install_ks: http://10.5.126.23/repo/rhel/ks/hardware-rhel-8-08disk -install_mac: 24-6E-96-B1-C7-F4 -install_noc: noc01.iad2.fedoraproject.org -install_repo: http://10.5.126.23/repo/rhel/RHEL8-x86_64/ -mac1: ec:f4:bb:d2:85:ec -mac2: ec:f4:bb:d2:85:ed -mac3: ec:f4:bb:d2:85:e8 -mac4: ec:f4:bb:d2:85:ea -nested: true -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/vmhost-x86-09.stg.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-09.stg.iad2.fedoraproject.org deleted file mode 100644 index 8f01630cc8..0000000000 --- a/inventory/host_vars/vmhost-x86-09.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,42 +0,0 @@ ---- -# This virthost only has stg instances, so it doesn't freeze -br0_ipv4: 10.3.166.19 -br0_ipv4_gw: 10.3.166.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac3 }}" -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -freezes: false -has_ipv4: yes -mac1: ec:f4:bb:e1:c8:f4 -mac2: ec:f4:bb:e1:c8:f5 -mac3: ec:f4:bb:e1:c8:f0 -mac4: ec:f4:bb:e1:c8:f2 -nested: true -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/vmhost-x86-10.stg.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-10.stg.iad2.fedoraproject.org deleted file mode 100644 index 41e5cb005c..0000000000 --- a/inventory/host_vars/vmhost-x86-10.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,42 +0,0 @@ ---- -# This virthost only has stg instances, so it doesn't freeze -br0_ipv4: 10.3.166.20 -br0_ipv4_gw: 10.3.166.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac3 }}" -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -freezes: false -has_ipv4: yes -mac1: ec:f4:bb:e1:cb:8c -mac2: ec:f4:bb:e1:cb:8d -mac3: ec:f4:bb:e1:cb:88 -mac4: ec:f4:bb:e1:cb:8a -nested: true -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/inventory b/inventory/inventory index 03c690cd4f..2394bdf90c 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -80,9 +80,7 @@ bvmhost-x86-06.iad2.fedoraproject.org bvmhost-x86-07.iad2.fedoraproject.org bvmhost-x86-08.iad2.fedoraproject.org bvmhost-x86-01.stg.iad2.fedoraproject.org -bvmhost-x86-02.stg.iad2.fedoraproject.org bvmhost-x86-03.stg.iad2.fedoraproject.org -bvmhost-x86-04.stg.iad2.fedoraproject.org bvmhost-x86-05.stg.iad2.fedoraproject.org [colo_virt] @@ -631,9 +629,7 @@ badges-web01.stg.iad2.fedoraproject.org # basset01.stg.iad2.fedoraproject.org bodhi-backend01.stg.iad2.fedoraproject.org bvmhost-x86-01.stg.iad2.fedoraproject.org -bvmhost-x86-02.stg.iad2.fedoraproject.org bvmhost-x86-03.stg.iad2.fedoraproject.org -bvmhost-x86-04.stg.iad2.fedoraproject.org bvmhost-x86-05.stg.iad2.fedoraproject.org bvmhost-p09-01.stg.iad2.fedoraproject.org bvmhost-a64-01.stg.iad2.fedoraproject.org @@ -706,7 +702,6 @@ sign-vault01.stg.iad2.fedoraproject.org sundries01.stg.iad2.fedoraproject.org value01.stg.iad2.fedoraproject.org value02.stg.iad2.fedoraproject.org -vmhost-x86-01.stg.iad2.fedoraproject.org vmhost-x86-02.stg.iad2.fedoraproject.org vmhost-x86-03.stg.iad2.fedoraproject.org vmhost-x86-04.stg.iad2.fedoraproject.org @@ -714,8 +709,6 @@ vmhost-x86-05.stg.iad2.fedoraproject.org vmhost-x86-06.stg.iad2.fedoraproject.org vmhost-x86-07.stg.iad2.fedoraproject.org vmhost-x86-08.stg.iad2.fedoraproject.org -vmhost-x86-09.stg.iad2.fedoraproject.org -vmhost-x86-10.stg.iad2.fedoraproject.org vmhost-x86-11.stg.iad2.fedoraproject.org vmhost-x86-12.stg.iad2.fedoraproject.org wiki01.stg.iad2.fedoraproject.org @@ -770,7 +763,6 @@ value01.stg.iad2.fedoraproject.org value02.stg.iad2.fedoraproject.org [virthost] -vmhost-x86-01.stg.iad2.fedoraproject.org vmhost-x86-02.stg.iad2.fedoraproject.org vmhost-x86-03.stg.iad2.fedoraproject.org vmhost-x86-04.stg.iad2.fedoraproject.org @@ -778,8 +770,6 @@ vmhost-x86-05.stg.iad2.fedoraproject.org vmhost-x86-06.stg.iad2.fedoraproject.org vmhost-x86-07.stg.iad2.fedoraproject.org vmhost-x86-08.stg.iad2.fedoraproject.org -vmhost-x86-09.stg.iad2.fedoraproject.org -vmhost-x86-10.stg.iad2.fedoraproject.org vmhost-x86-11.stg.iad2.fedoraproject.org vmhost-x86-12.stg.iad2.fedoraproject.org vmhost-x86-01.iad2.fedoraproject.org