diff --git a/inventory/host_vars/virthost01.stg.phx2.fedoraproject.org b/inventory/host_vars/virthost01.stg.phx2.fedoraproject.org deleted file mode 100644 index 730b59bff8..0000000000 --- a/inventory/host_vars/virthost01.stg.phx2.fedoraproject.org +++ /dev/null @@ -1,17 +0,0 @@ ---- -# This virthost only has stg instances, so it doesn't freeze -freezes: false -nested: true -dns: 10.5.126.21 -gw: 10.5.128.254 -br0_ip: 10.5.128.40 -br0_nm: 255.255.255.0 -br1_ip: 10.5.127.202 -br1_nm: 255.255.255.0 - -install_noc: noc01.phx2.fedoraproject.org -install_mac: 24-6E-96-B1-C7-F4 -# Inside this, expect /vmlinuz and /initrd.img -install_binpath: /uefi/x86_64/el7 -install_ks: http://10.5.126.23/repo/rhel/ks/hardware-rhel-7-08disk -install_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ diff --git a/inventory/host_vars/virthost02.stg.phx2.fedoraproject.org b/inventory/host_vars/virthost02.stg.phx2.fedoraproject.org deleted file mode 100644 index bca50fc71a..0000000000 --- a/inventory/host_vars/virthost02.stg.phx2.fedoraproject.org +++ /dev/null @@ -1,10 +0,0 @@ ---- -# This virthost only has stg instances, so it doesn't freeze -freezes: false -nested: true -dns: 10.5.126.21 -gw: 10.5.128.254 -br0_ip: 10.5.128.41 -br0_nm: 255.255.255.0 -br1_ip: 10.5.127.195 -br1_nm: 255.255.255.0 diff --git a/inventory/host_vars/virthost03.stg.phx2.fedoraproject.org b/inventory/host_vars/virthost03.stg.phx2.fedoraproject.org deleted file mode 100644 index bca50fc71a..0000000000 --- a/inventory/host_vars/virthost03.stg.phx2.fedoraproject.org +++ /dev/null @@ -1,10 +0,0 @@ ---- -# This virthost only has stg instances, so it doesn't freeze -freezes: false -nested: true -dns: 10.5.126.21 -gw: 10.5.128.254 -br0_ip: 10.5.128.41 -br0_nm: 255.255.255.0 -br1_ip: 10.5.127.195 -br1_nm: 255.255.255.0 diff --git a/inventory/host_vars/virthost04.stg.phx2.fedoraproject.org b/inventory/host_vars/virthost04.stg.phx2.fedoraproject.org deleted file mode 100644 index 92cc5c0e3a..0000000000 --- a/inventory/host_vars/virthost04.stg.phx2.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -# This virthost only has stg instances, so it doesn't freeze -freezes: false diff --git a/inventory/host_vars/virthost05.stg.phx2.fedoraproject.org b/inventory/host_vars/virthost05.stg.phx2.fedoraproject.org deleted file mode 100644 index 92cc5c0e3a..0000000000 --- a/inventory/host_vars/virthost05.stg.phx2.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -# This virthost only has stg instances, so it doesn't freeze -freezes: false diff --git a/inventory/host_vars/vmhost-x86-01.stg.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-01.stg.iad2.fedoraproject.org new file mode 100644 index 0000000000..9782477195 --- /dev/null +++ b/inventory/host_vars/vmhost-x86-01.stg.iad2.fedoraproject.org @@ -0,0 +1,20 @@ +--- +# This virthost only has stg instances, so it doesn't freeze +freezes: false +nested: true +dns: 10.3.163.33 +gw: 10.3.166.254 +br0_ip: 10.3.166.11 +br0_nm: 255.255.255.0 + +install_noc: noc01.iad2.fedoraproject.org +install_mac: 24-6E-96-B1-C7-F4 +# 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_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 diff --git a/inventory/host_vars/vmhost-x86-02.stg.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-02.stg.iad2.fedoraproject.org new file mode 100644 index 0000000000..1d64ddb5f9 --- /dev/null +++ b/inventory/host_vars/vmhost-x86-02.stg.iad2.fedoraproject.org @@ -0,0 +1,13 @@ +--- +# This virthost only has stg instances, so it doesn't freeze +freezes: false +nested: true +dns: 10.3.163.33 +gw: 10.3.166.254 +br0_ip: 10.3.166.12 +br0_nm: 255.255.255.0 + +mac1: 24:6e:96:13:ed:dc +mac2: 24:6e:96:13:ed:dd +mac3: 24:6e:96:13:ed:d8 +mac4: 24:6e:96:13:ed:da diff --git a/inventory/host_vars/vmhost-x86-04.stg.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-04.stg.iad2.fedoraproject.org new file mode 100644 index 0000000000..140a077b84 --- /dev/null +++ b/inventory/host_vars/vmhost-x86-04.stg.iad2.fedoraproject.org @@ -0,0 +1,13 @@ +--- +# This virthost only has stg instances, so it doesn't freeze +freezes: false +nested: true +dns: 10.3.163.33 +gw: 10.3.166.254 +br0_ip: 10.3.166.14 +br0_nm: 255.255.255.0 + +mac1: 24:6e:96:05:d7:84 +mac2: 24:6e:96:05:d7:85 +mac3: 24:6e:96:05:d7:80 +mac4: 24:6e:96:05:d7:82 diff --git a/inventory/inventory b/inventory/inventory index 69928841da..5d621a3d05 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -671,11 +671,13 @@ value01.iad2.fedoraproject.org # value01.stg.iad2.fedoraproject.org [virthost] -# virthost01.stg.iad2.fedoraproject.org -# virthost02.stg.iad2.fedoraproject.org -# virthost03.stg.iad2.fedoraproject.org -# virthost04.stg.iad2.fedoraproject.org -# virthost05.stg.iad2.fedoraproject.org +vmhost-x86-01.stg.iad2.fedoraproject.org +vmhost-x86-02.stg.iad2.fedoraproject.org +#doesn't want to pxe boot +#vmhost-x86-03.stg.iad2.fedoraproject.org +vmhost-x86-04.stg.iad2.fedoraproject.org +#doesn't want to pxe boot +#vmhost-x86-05.stg.iad2.fedoraproject.org vmhost-x86-01.iad2.fedoraproject.org vmhost-x86-02.iad2.fedoraproject.org vmhost-x86-03.iad2.fedoraproject.org @@ -1378,6 +1380,13 @@ sundries02.iad2.fedoraproject.org tang01.iad2.fedoraproject.org tang02.iad2.fedoraproject.org value01.iad2.fedoraproject.org +vmhost-x86-01.stg.iad2.fedoraproject.org +vmhost-x86-02.stg.iad2.fedoraproject.org +#doesn't want to pxe boot +#vmhost-x86-03.stg.iad2.fedoraproject.org +vmhost-x86-04.stg.iad2.fedoraproject.org +#doesn't want to pxe boot +#vmhost-x86-05.stg.iad2.fedoraproject.org vmhost-x86-01.iad2.fedoraproject.org vmhost-x86-02.iad2.fedoraproject.org vmhost-x86-03.iad2.fedoraproject.org