diff --git a/inventory/host_vars/elections01.phx2.fedoraproject.org b/inventory/host_vars/elections01.phx2.fedoraproject.org deleted file mode 100644 index 99c8b5f66e..0000000000 --- a/inventory/host_vars/elections01.phx2.fedoraproject.org +++ /dev/null @@ -1,17 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 - -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ - -volgroup: /dev/vg_guests -eth0_ip: 10.5.126.107 -vmhost: virthost19.phx2.fedoraproject.org -datacenter: phx2 - -# GDPR SAR variables - datanommer/datagrepper -sar_script: /usr/local/bin/elections_sar.py -sar_script_user: apache -sar_output_file: elections.json diff --git a/inventory/host_vars/elections01.stg.phx2.fedoraproject.org b/inventory/host_vars/elections01.stg.phx2.fedoraproject.org deleted file mode 100644 index e07fcc2216..0000000000 --- a/inventory/host_vars/elections01.stg.phx2.fedoraproject.org +++ /dev/null @@ -1,12 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.128.254 -dns: 10.5.126.21 - -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ - -volgroup: /dev/vg_guests -eth0_ip: 10.5.128.125 -vmhost: virthost03.stg.phx2.fedoraproject.org -datacenter: phx2 diff --git a/inventory/host_vars/elections02.phx2.fedoraproject.org b/inventory/host_vars/elections02.phx2.fedoraproject.org deleted file mode 100644 index 4baedc7e5f..0000000000 --- a/inventory/host_vars/elections02.phx2.fedoraproject.org +++ /dev/null @@ -1,12 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 - -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ - -volgroup: /dev/vg_guests -eth0_ip: 10.5.126.108 -vmhost: virthost06.phx2.fedoraproject.org -datacenter: phx2 diff --git a/inventory/inventory b/inventory/inventory index e632b1cc90..db9f77cd78 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -249,7 +249,6 @@ blockerbugs01.stg.phx2.fedoraproject.org bodhi-backend01.stg.phx2.fedoraproject.org busgateway01.stg.phx2.fedoraproject.org datagrepper01.stg.phx2.fedoraproject.org -elections01.stg.phx2.fedoraproject.org fedocal01.stg.phx2.fedoraproject.org koji01.stg.phx2.fedoraproject.org os-node01.stg.phx2.fedoraproject.org @@ -292,13 +291,6 @@ download_ibiblio download_rdu2 download_cc_rdu -[elections] -elections01.phx2.fedoraproject.org -elections02.phx2.fedoraproject.org - -[elections_stg] -elections01.stg.phx2.fedoraproject.org - [fas] fas01.phx2.fedoraproject.org @@ -666,7 +658,6 @@ db01.stg.phx2.fedoraproject.org db03.stg.phx2.fedoraproject.org oci-candidate-registry01.stg.phx2.fedoraproject.org oci-registry01.stg.phx2.fedoraproject.org -elections01.stg.phx2.fedoraproject.org #fas01.stg.phx2.fedoraproject.org fedimg01.stg.phx2.fedoraproject.org fedocal01.stg.phx2.fedoraproject.org @@ -1246,7 +1237,6 @@ bodhi-backend01.phx2.fedoraproject.org mailman01.phx2.fedoraproject.org people02.fedoraproject.org db-datanommer02.phx2.fedoraproject.org -elections01.phx2.fedoraproject.org fedocal02.phx2.fedoraproject.org nuancier01.phx2.fedoraproject.org pagure01.fedoraproject.org diff --git a/roles/openvpn/server/files/ccd/elections01.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/elections01.phx2.fedoraproject.org deleted file mode 100644 index 3a6c835285..0000000000 --- a/roles/openvpn/server/files/ccd/elections01.phx2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.44 192.168.0.44 diff --git a/roles/openvpn/server/files/ccd/elections02.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/elections02.phx2.fedoraproject.org deleted file mode 100644 index ee6025c33d..0000000000 --- a/roles/openvpn/server/files/ccd/elections02.phx2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.47 192.168.0.47