diff --git a/inventory/hardware b/inventory/hardware index 6c7faebb33..3920fc703f 100644 --- a/inventory/hardware +++ b/inventory/hardware @@ -5,8 +5,6 @@ ibiblio05.fedoraproject.org # ssh often disabled #autosign01.iad2.fedoraproject.org #autosign02.iad2.fedoraproject.org -virthost-rdu01.fedoraproject.org -#virthost-rdu02.fedoraproject.org virthost-cc-rdu01.fedoraproject.org virthost-cc-rdu02.fedoraproject.org vmhost-x86-cc05.rdu-cc.fedoraproject.org diff --git a/inventory/host_vars/virthost-rdu01.fedoraproject.org b/inventory/host_vars/virthost-rdu01.fedoraproject.org deleted file mode 100644 index 2d51df1b8a..0000000000 --- a/inventory/host_vars/virthost-rdu01.fedoraproject.org +++ /dev/null @@ -1,59 +0,0 @@ ---- -br0_ipv4: 172.31.2.11 -br0_ipv4_gw: 172.31.2.254 -br0_ipv4_nm: 24 -br0_port0_mac: '{{ mac0 }}' -br1_ipv4: 172.31.1.2 -br1_ipv4_nm: 24 -br1_port0_mac: '{{ mac1 }}' -datacenter: rdu -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: fedoraproject.org -mac0: ec:f4:bb:e1:6d:e4 -mac1: ec:f4:bb:e1:6d:e5 -nagios_Check_Services: - mail: false - nrpe: false -network_connections: - - autoconnect: true - ip: - address: - - '{{ br0_ipv4 }}/{{ br0_ipv4_nm }}' - dhcp4: false - dns: - - '{{ dns1 }}' - dns_search: - - '{{ dns_search1 }}' - gateway4: '{{ br0_ipv4_gw }}' - name: br0 - state: up - type: bridge - - mac: '{{ br0_port0_mac }}' - master: br0 - name: br0-port0 - state: up - type: ethernet - - autoconnect: true - ip: - address: - - '{{ br1_ipv4 }}/{{ br1_ipv4_nm }}' - dhcp4: false - dns: - - '{{ dns1 }}' - - '{{ dns2 }}' - dns_search: - - '{{ dns_search1 }}' - name: br1 - state: up - type: bridge - - mac: '{{ br1_port0_mac }}' - master: br1 - name: br1-port0 - state: up - type: ethernet -nrpe_procs_crit: 1000 -nrpe_procs_warn: 900 -postfix_group: vpn -public_ip: 209.132.190.11 -vpn: true diff --git a/inventory/host_vars/virthost-rdu02.fedoraproject.org b/inventory/host_vars/virthost-rdu02.fedoraproject.org deleted file mode 100644 index 5315da7816..0000000000 --- a/inventory/host_vars/virthost-rdu02.fedoraproject.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -br0_ip: 172.31.2.12 -br0_nm: 255.255.255.0 -datacenter: rdu -dns: 8.8.8.8 -gw: 172.31.2.254 -nm: 255.255.255.0 -nrpe_procs_crit: 1000 -nrpe_procs_warn: 900 -postfix_group: vpn -public_ip: 209.132.190.12 -#br1_ip: 172.31.1.2 -#br1_nm: 255.255.255.0 -vpn: true diff --git a/inventory/inventory b/inventory/inventory index a0d4de90d6..37415d1fd9 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -93,8 +93,6 @@ ibiblio01.fedoraproject.org ibiblio05.fedoraproject.org internetx02.fedoraproject.org osuosl01.fedoraproject.org -virthost-rdu01.fedoraproject.org -#virthost-rdu02.fedoraproject.org virthost-cc-rdu01.fedoraproject.org virthost-cc-rdu02.fedoraproject.org #virthost-cc-rdu03.fedoraproject.org