diff --git a/files/2fa/pam_url.conf.fakefas01.fedoraproject.org b/files/2fa/pam_url.conf.fakefas01.fedoraproject.org deleted file mode 100644 index 9ce7690b81..0000000000 --- a/files/2fa/pam_url.conf.fakefas01.fedoraproject.org +++ /dev/null @@ -1,21 +0,0 @@ -pam_url: -{ - settings: - { - url = "https://fas-all.phx2.fedoraproject.org:8443/"; # URI to fetch - returncode = "OK"; # The remote script/cgi should return a 200 http code and this string as its only results - userfield = "user"; # userfield name to send - passwdfield = "token"; # passwdfield name to send - extradata = "&do=login"; # extradata to send - prompt = "Password+Token: "; # password prompt - }; - - ssl: - { - verify_peer = true; # Should we verify SSL ? - verify_host = true; # Should we verify the CN in the SSL cert? - client_cert = "/etc/pki/tls/private/totpcgi.pem"; # file to use as client-side certificate - client_key = "/etc/pki/tls/private/totpcgi.pem"; # file to use as client-side key (can be same file as above if a single cert) - ca_cert = "/etc/pki/tls/private/totpcgi-ca.cert"; - }; -}; diff --git a/files/2fa/pam_url.conf.fed-cloud09.cloud.fedoraproject.org b/files/2fa/pam_url.conf.fed-cloud09.cloud.fedoraproject.org deleted file mode 100644 index 9ce7690b81..0000000000 --- a/files/2fa/pam_url.conf.fed-cloud09.cloud.fedoraproject.org +++ /dev/null @@ -1,21 +0,0 @@ -pam_url: -{ - settings: - { - url = "https://fas-all.phx2.fedoraproject.org:8443/"; # URI to fetch - returncode = "OK"; # The remote script/cgi should return a 200 http code and this string as its only results - userfield = "user"; # userfield name to send - passwdfield = "token"; # passwdfield name to send - extradata = "&do=login"; # extradata to send - prompt = "Password+Token: "; # password prompt - }; - - ssl: - { - verify_peer = true; # Should we verify SSL ? - verify_host = true; # Should we verify the CN in the SSL cert? - client_cert = "/etc/pki/tls/private/totpcgi.pem"; # file to use as client-side certificate - client_key = "/etc/pki/tls/private/totpcgi.pem"; # file to use as client-side key (can be same file as above if a single cert) - ca_cert = "/etc/pki/tls/private/totpcgi-ca.cert"; - }; -}; diff --git a/files/2fa/pam_url.conf.j2 b/files/2fa/pam_url.conf.j2 index 8395670fea..53de133ec2 100644 --- a/files/2fa/pam_url.conf.j2 +++ b/files/2fa/pam_url.conf.j2 @@ -4,8 +4,6 @@ pam_url: { {% if env == 'staging' %} url = "https://fas-all.stg.phx2.fedoraproject.org:8443/"; # URI to fetch - {% elif datacenter == 'phx2' %} - url = "https://fas-all.phx2.fedoraproject.org:8443/"; # URI to fetch {% elif datacenter == 'iad2' %} url = "https://fas-all.iad2.fedoraproject.org:8443/"; # URI to fetch {% else %} diff --git a/files/2fa/pam_url.conf.taskotron-stg01.qa.fedoraproject.org b/files/2fa/pam_url.conf.taskotron-stg01.qa.fedoraproject.org deleted file mode 100644 index 6dcf99cbad..0000000000 --- a/files/2fa/pam_url.conf.taskotron-stg01.qa.fedoraproject.org +++ /dev/null @@ -1,27 +0,0 @@ -pam_url: -{ - settings: - { - {% if env == 'staging' %} - url = "https://fas-all.stg.phx2.fedoraproject.org:8443/"; # URI to fetch - {% elif datacenter == 'phx2' %} - url = "https://fas-all.phx2.fedoraproject.org:8443/"; # URI to fetch - {% else %} - url = "https://fas-all.vpn.fedoraproject.org:8443/"; # URI to fetch - {% endif %} - returncode = "OK"; # The remote script/cgi should return a 200 http code and this string as its only results - userfield = "user"; # userfield name to send - passwdfield = "token"; # passwdfield name to send - extradata = "&do=login"; # extradata to send - prompt = "Password+Token: "; # password prompt - }; - - ssl: - { - verify_peer = true; # Should we verify SSL ? - verify_host = true; # Should we verify the CN in the SSL cert? - client_cert = "/etc/pki/tls/private/totpcgi.pem"; # file to use as client-side certificate - client_key = "/etc/pki/tls/private/totpcgi.pem"; # file to use as client-side key (can be same file as above if a single cert) - ca_cert = "/etc/pki/tls/private/totpcgi-ca.cert"; - }; -}; diff --git a/inventory/group_vars/phx2 b/inventory/group_vars/phx2 deleted file mode 100644 index b3af1cf34f..0000000000 --- a/inventory/group_vars/phx2 +++ /dev/null @@ -1,25 +0,0 @@ ---- -# group variables for all hosts in iad2 datacenter -dns1: "10.5.126.21" -dns2: "10.5.126.22" - -datacenter: phx2 -#preferred_dc: phx2 - - -ipa_server: ipa01.phx2.fedoraproject.org - -# for now, lets not monitor any of them from phx2. - -nagios_Can_Connect: false - -nagios_Check_Services: - mail: false - nrpe: false - sshd: false - swap: false - ping: false - raid: false - -certbot_datacenter: phx2 -nagios_server: noc01.phx2.fedoraproject.org diff --git a/inventory/hardware b/inventory/hardware index b4824bcd9a..58b88cc7e8 100644 --- a/inventory/hardware +++ b/inventory/hardware @@ -1,30 +1,30 @@ [dells] osuosl01.fedoraproject.org -bvirthost01.phx2.fedoraproject.org +## bvirthost01.phx2.fedoraproject.org # bvirthost01.stg.phx2.fedoraproject.org -bvirthost04.phx2.fedoraproject.org -bvirthost05.phx2.fedoraproject.org -bvirthost12.phx2.fedoraproject.org -bvirthost13.phx2.fedoraproject.org -bvirthost14.phx2.fedoraproject.org -bvirthost15.phx2.fedoraproject.org +## bvirthost04.phx2.fedoraproject.org +## bvirthost05.phx2.fedoraproject.org +## bvirthost12.phx2.fedoraproject.org +## bvirthost13.phx2.fedoraproject.org +## bvirthost14.phx2.fedoraproject.org +## bvirthost15.phx2.fedoraproject.org # virthost01.stg.phx2.fedoraproject.org # virthost02.stg.phx2.fedoraproject.org # virthost03.stg.phx2.fedoraproject.org # virthost04.stg.phx2.fedoraproject.org # virthost05.stg.phx2.fedoraproject.org -virthost01.phx2.fedoraproject.org -virthost02.phx2.fedoraproject.org +## virthost01.phx2.fedoraproject.org +## virthost02.phx2.fedoraproject.org #autosign02.phx2.fedoraproject.org -virthost04.phx2.fedoraproject.org -virthost12.phx2.fedoraproject.org -virthost14.phx2.fedoraproject.org -virthost15.phx2.fedoraproject.org -virthost17.phx2.fedoraproject.org -virthost18.phx2.fedoraproject.org -virthost19.phx2.fedoraproject.org -virthost21.phx2.fedoraproject.org -virthost22.phx2.fedoraproject.org +## virthost04.phx2.fedoraproject.org +## virthost12.phx2.fedoraproject.org +## virthost14.phx2.fedoraproject.org +## virthost15.phx2.fedoraproject.org +## virthost17.phx2.fedoraproject.org +## virthost18.phx2.fedoraproject.org +## virthost19.phx2.fedoraproject.org +## virthost21.phx2.fedoraproject.org +## virthost22.phx2.fedoraproject.org ibiblio01.fedoraproject.org #ibiblio04.fedoraproject.org ibiblio05.fedoraproject.org @@ -33,110 +33,78 @@ virthost-comm03.qa.fedoraproject.org virthost-comm04.qa.fedoraproject.org #osuosl03.fedoraproject.org # ssh often disabled -#autosign01.phx2.fedoraproject.org +#autosign01.iad2.fedoraproject.org virthost-rdu01.fedoraproject.org #virthost-rdu02.fedoraproject.org virthost-cc-rdu01.fedoraproject.org virthost-cc-rdu02.fedoraproject.org -buildhw-01.phx2.fedoraproject.org -buildhw-02.phx2.fedoraproject.org -buildhw-03.phx2.fedoraproject.org -buildhw-04.phx2.fedoraproject.org -buildhw-05.phx2.fedoraproject.org -buildhw-06.phx2.fedoraproject.org -buildhw-07.phx2.fedoraproject.org -buildhw-08.phx2.fedoraproject.org -buildhw-09.phx2.fedoraproject.org -buildhw-10.phx2.fedoraproject.org -buildvmhost-01.phx2.fedoraproject.org -buildvmhost-02.phx2.fedoraproject.org -buildvmhost-03.phx2.fedoraproject.org -buildvmhost-04.phx2.fedoraproject.org -qa01.qa.fedoraproject.org -qa02.qa.fedoraproject.org -qa09.qa.fedoraproject.org -qa14.qa.fedoraproject.org -bkernel03.phx2.fedoraproject.org +##buildhw-01.phx2.fedoraproject.org +##buildhw-02.phx2.fedoraproject.org +##buildhw-03.phx2.fedoraproject.org +##buildhw-04.phx2.fedoraproject.org +##buildhw-05.phx2.fedoraproject.org +##buildhw-06.phx2.fedoraproject.org +##buildhw-07.phx2.fedoraproject.org +##buildhw-08.phx2.fedoraproject.org +##buildhw-09.phx2.fedoraproject.org +##buildhw-10.phx2.fedoraproject.org +##buildvmhost-01.phx2.fedoraproject.org +##buildvmhost-02.phx2.fedoraproject.org +##buildvmhost-03.phx2.fedoraproject.org +##buildvmhost-04.phx2.fedoraproject.org +##qa01.qa.fedoraproject.org +##qa02.qa.fedoraproject.org +##qa09.qa.fedoraproject.org +##qa14.qa.fedoraproject.org +##bkernel03.phx2.fedoraproject.org #bkernel04.phx2.fedoraproject.org [ibms] virthost-cc-rdu03.fedoraproject.org osuosl02.fedoraproject.org -data-analysis01.phx2.fedoraproject.org +##data-analysis01.phx2.fedoraproject.org download-rdu01.fedoraproject.org [powerpc] -ppc8-01.ppc.fedoraproject.org -ppc8-02.ppc.fedoraproject.org -ppc8-03.ppc.fedoraproject.org -ppc8-04.ppc.fedoraproject.org - -[moonshot] -#aarch64-c01n1.arm.fedoraproject.org -#aarch64-c02n1.arm.fedoraproject.org -#aarch64-c03n1.arm.fedoraproject.org -#aarch64-c04n1.arm.fedoraproject.org -#aarch64-c05n1.arm.fedoraproject.org -#aarch64-c06n1.arm.fedoraproject.org -#aarch64-c07n1.arm.fedoraproject.org -#aarch64-c08n1.arm.fedoraproject.org -#aarch64-c09n1.arm.fedoraproject.org -#aarch64-c10n1.arm.fedoraproject.org -#aarch64-c11n1.arm.fedoraproject.org -#aarch64-c12n1.arm.fedoraproject.org -#aarch64-c13n1.arm.fedoraproject.org -#aarch64-c14n1.arm.fedoraproject.org -#aarch64-c15n1.arm.fedoraproject.org -#aarch64-c16n1.arm.fedoraproject.org -#aarch64-c17n1.arm.fedoraproject.org -#aarch64-c18n1.arm.fedoraproject.org -#aarch64-c19n1.arm.fedoraproject.org -#aarch64-c20n1.arm.fedoraproject.org -#aarch64-c21n1.arm.fedoraproject.org -#aarch64-c22n1.arm.fedoraproject.org -#aarch64-c23n1.arm.fedoraproject.org -#aarch64-c24n1.arm.fedoraproject.org -#aarch64-c25n1.arm.fedoraproject.org -aarch64-c26n1-oqa.arm.fedoraproject.org -aarch64-c27n1-oqa.arm.fedoraproject.org -aarch64-c28n1-oqa.arm.fedoraproject.org -aarch64-c29n1-oqa.arm.fedoraproject.org -aarch64-c30n1-oqa.arm.fedoraproject.org +##ppc8-01.ppc.fedoraproject.org +##ppc8-02.ppc.fedoraproject.org +##ppc8-03.ppc.fedoraproject.org +##ppc8-04.ppc.fedoraproject.org [appliedmicro] # buildhw-aarch64-01.arm.fedoraproject.org -buildhw-aarch64-02.arm.fedoraproject.org -buildhw-aarch64-03.arm.fedoraproject.org -buildhw-aarch64-04.arm.fedoraproject.org -buildhw-aarch64-05.arm.fedoraproject.org -buildhw-aarch64-06.arm.fedoraproject.org -buildhw-aarch64-07.arm.fedoraproject.org -buildhw-aarch64-08.arm.fedoraproject.org +##buildhw-aarch64-02.arm.fedoraproject.org +##buildhw-aarch64-03.arm.fedoraproject.org +##buildhw-aarch64-04.arm.fedoraproject.org +##buildhw-aarch64-05.arm.fedoraproject.org +##buildhw-aarch64-06.arm.fedoraproject.org +##buildhw-aarch64-07.arm.fedoraproject.org +##buildhw-aarch64-08.arm.fedoraproject.org # [storinator] # storinator01.fedorainfracloud.org [cavium] # 2 thunderx2 machines on loan for builders -buildvmhost-aarch64-01.arm.fedoraproject.org -buildvmhost-aarch64-02.arm.fedoraproject.org +##buildvmhost-aarch64-01.arm.fedoraproject.org +##buildvmhost-aarch64-02.arm.fedoraproject.org # 2 thunderx1 machines on loan for copr builders # virthost-aarch64-os01.fedorainfracloud.org # virthost-aarch64-os02.fedorainfracloud.org [emag] -buildvmhost-aarch64-10.arm.fedoraproject.org -buildvmhost-aarch64-11.arm.fedoraproject.org -buildvmhost-aarch64-12.arm.fedoraproject.org -buildvmhost-aarch64-13.arm.fedoraproject.org -buildvmhost-aarch64-14.arm.fedoraproject.org -buildvmhost-aarch64-15.arm.fedoraproject.org -buildvmhost-aarch64-16.arm.fedoraproject.org -buildvmhost-aarch64-17.arm.fedoraproject.org -buildvmhost-aarch64-18.arm.fedoraproject.org -buildvmhost-a64-osbs-01.arm.fedoraproject.org -openqa-aarch64-01.qa.fedoraproject.org -openqa-aarch64-03.qa.fedoraproject.org +##buildvmhost-aarch64-10.arm.fedoraproject.org +##buildvmhost-aarch64-11.arm.fedoraproject.org +##buildvmhost-aarch64-12.arm.fedoraproject.org +##buildvmhost-aarch64-13.arm.fedoraproject.org +##buildvmhost-aarch64-14.arm.fedoraproject.org +##buildvmhost-aarch64-15.arm.fedoraproject.org +##buildvmhost-aarch64-16.arm.fedoraproject.org +##buildvmhost-aarch64-17.arm.fedoraproject.org +##buildvmhost-aarch64-18.arm.fedoraproject.org +##buildvmhost-a64-osbs-01.arm.fedoraproject.org +##openqa-aarch64-01.qa.fedoraproject.org +##openqa-aarch64-03.qa.fedoraproject.org bvmhost-a64-01.iad2.fedoraproject.org bvmhost-a64-02.iad2.fedoraproject.org bvmhost-a64-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/aarch64-c25n1.arm.fedoraproject.org b/inventory/host_vars/aarch64-c25n1.arm.fedoraproject.org deleted file mode 100644 index 92cc5c0e3a..0000000000 --- a/inventory/host_vars/aarch64-c25n1.arm.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/aarch64-c26n1-oqa.arm.fedoraproject.org b/inventory/host_vars/aarch64-c26n1-oqa.arm.fedoraproject.org deleted file mode 100644 index 5ec2398ed3..0000000000 --- a/inventory/host_vars/aarch64-c26n1-oqa.arm.fedoraproject.org +++ /dev/null @@ -1,35 +0,0 @@ ---- - -eth0_ip: 10.5.129.126 -gw: 10.5.129.254 -nm: 255.255.255.0 -dns: 10.5.126.21 - -datacenter: phx2 -fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran,sysadmin-secondary -nrpe_procs_warn: 250 -nrpe_procs_crit: 300 - -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" - -# openQA tap worker hosts (like this one) do stuff with ifcfg that base -# doesn't understand. terrible, terrible stuff. seriously - it doesn't -# handle the openvswitch config well. so let's tell it to just configure -# the regular interfaces (which on this system is eth0 and eth1) for us, -# disabling all but the one we want to use (eth0), and leave everything -# else alone. -ansible_ifcfg_allowlist: ['eth0', 'eth1'] -ansible_ifcfg_disabled: ['eth1'] - -# 5 is pushing it a bit, but we need 5 simultaneous tap workers for -# the server-dvd-iso support_server test cluster... -openqa_workers: 5 -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043'] - -# has an HW RNG, so let's have rngd -openqa_rngd: True diff --git a/inventory/host_vars/aarch64-c27n1-oqa.arm.fedoraproject.org b/inventory/host_vars/aarch64-c27n1-oqa.arm.fedoraproject.org deleted file mode 100644 index 4109415bda..0000000000 --- a/inventory/host_vars/aarch64-c27n1-oqa.arm.fedoraproject.org +++ /dev/null @@ -1,31 +0,0 @@ ---- - -eth0_ip: 10.5.129.127 -gw: 10.5.129.254 -nm: 255.255.255.0 -dns: 10.5.126.21 - -datacenter: phx2 -fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran,sysadmin-secondary -nrpe_procs_warn: 250 -nrpe_procs_crit: 300 - -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" - -# openQA tap worker hosts (like this one) do stuff with ifcfg that base -# doesn't understand. terrible, terrible stuff. seriously - it doesn't -# handle the openvswitch config well. so let's tell it to just configure -# the actual connected interface (which on this system is eth0) for us -# and leave everything else alone. -ansible_ifcfg_allowlist: ['eth0'] - -openqa_workers: 4 -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043'] - -# has an HW RNG, so let's have rngd -openqa_rngd: True diff --git a/inventory/host_vars/aarch64-c28n1-oqa.arm.fedoraproject.org b/inventory/host_vars/aarch64-c28n1-oqa.arm.fedoraproject.org deleted file mode 100644 index 770b88a99d..0000000000 --- a/inventory/host_vars/aarch64-c28n1-oqa.arm.fedoraproject.org +++ /dev/null @@ -1,31 +0,0 @@ ---- - -eth0_ip: 10.5.129.128 -gw: 10.5.129.254 -nm: 255.255.255.0 -dns: 10.5.126.21 - -datacenter: phx2 -fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran,sysadmin-secondary -nrpe_procs_warn: 250 -nrpe_procs_crit: 300 - -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" - -# openQA tap worker hosts (like this one) do stuff with ifcfg that base -# doesn't understand. terrible, terrible stuff. seriously - it doesn't -# handle the openvswitch config well. so let's tell it to just configure -# the actual connected interface (which on this system is eth0) for us -# and leave everything else alone. -ansible_ifcfg_allowlist: ['eth0'] - -openqa_workers: 4 -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043'] - -# has an HW RNG, so let's have rngd -openqa_rngd: True diff --git a/inventory/host_vars/aarch64-c29n1-oqa.arm.fedoraproject.org b/inventory/host_vars/aarch64-c29n1-oqa.arm.fedoraproject.org deleted file mode 100644 index 4b5dc326ce..0000000000 --- a/inventory/host_vars/aarch64-c29n1-oqa.arm.fedoraproject.org +++ /dev/null @@ -1,31 +0,0 @@ ---- - -eth0_ip: 10.5.129.129 -gw: 10.5.129.254 -nm: 255.255.255.0 -dns: 10.5.126.21 - -datacenter: phx2 -fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran,sysadmin-secondary -nrpe_procs_warn: 250 -nrpe_procs_crit: 300 - -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" - -# openQA tap worker hosts (like this one) do stuff with ifcfg that base -# doesn't understand. terrible, terrible stuff. seriously - it doesn't -# handle the openvswitch config well. so let's tell it to just configure -# the actual connected interface (which on this system is eth0) for us -# and leave everything else alone. -ansible_ifcfg_allowlist: ['eth0'] - -openqa_workers: 4 -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043'] - -# has an HW RNG, so let's have rngd -openqa_rngd: True diff --git a/inventory/host_vars/aarch64-c30n1-oqa.arm.fedoraproject.org b/inventory/host_vars/aarch64-c30n1-oqa.arm.fedoraproject.org deleted file mode 100644 index a0eeaa4474..0000000000 --- a/inventory/host_vars/aarch64-c30n1-oqa.arm.fedoraproject.org +++ /dev/null @@ -1,31 +0,0 @@ ---- - -eth0_ip: 10.5.129.130 -gw: 10.5.129.254 -nm: 255.255.255.0 -dns: 10.5.126.21 - -datacenter: phx2 -fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran,sysadmin-secondary -nrpe_procs_warn: 250 -nrpe_procs_crit: 300 - -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" - -# openQA tap worker hosts (like this one) do stuff with ifcfg that base -# doesn't understand. terrible, terrible stuff. seriously - it doesn't -# handle the openvswitch config well. so let's tell it to just configure -# the actual connected interface (which on this system is eth0) for us -# and leave everything else alone. -ansible_ifcfg_allowlist: ['eth0'] - -openqa_workers: 4 -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043'] - -# has an HW RNG, so let's have rngd -openqa_rngd: True diff --git a/inventory/host_vars/autosign01.phx2.fedoraproject.org b/inventory/host_vars/autosign01.phx2.fedoraproject.org deleted file mode 100644 index 001eeddd5e..0000000000 --- a/inventory/host_vars/autosign01.phx2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.125.254 -dns: 10.5.126.21 -eth0_ip: 10.5.125.22 -eth1_ip: 10.5.127.49 -datacenter: phx2 diff --git a/inventory/host_vars/backup01.phx2.fedoraproject.org b/inventory/host_vars/backup01.phx2.fedoraproject.org deleted file mode 100644 index 675881ac2d..0000000000 --- a/inventory/host_vars/backup01.phx2.fedoraproject.org +++ /dev/null @@ -1,11 +0,0 @@ ---- -nrpe_procs_warn: 1200 -nrpe_procs_crit: 1400 - -datacenter: phx2 - -eth0_ip: 10.5.126.161 -eth1_ip: 10.5.127.24 -gw: 10.5.126.254 - -grokmirror_topdir: /fedora_backups/grokmirror diff --git a/inventory/host_vars/badges-backend01.phx2.fedoraproject.org b/inventory/host_vars/badges-backend01.phx2.fedoraproject.org deleted file mode 100644 index 9185d9a6b9..0000000000 --- a/inventory/host_vars/badges-backend01.phx2.fedoraproject.org +++ /dev/null @@ -1,15 +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.100 -vmhost: virthost19.phx2.fedoraproject.org -datacenter: phx2 - -# GDPR SAR variables -sar_script: /usr/local/bin/get-sar-person-details -sar_script_user: fedmsg -sar_output_file: badges.json diff --git a/inventory/host_vars/badges-web01.phx2.fedoraproject.org b/inventory/host_vars/badges-web01.phx2.fedoraproject.org deleted file mode 100644 index 1b3a001ad0..0000000000 --- a/inventory/host_vars/badges-web01.phx2.fedoraproject.org +++ /dev/null @@ -1,10 +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.101 -vmhost: virthost21.phx2.fedoraproject.org -datacenter: phx2 diff --git a/inventory/host_vars/badges-web02.phx2.fedoraproject.org b/inventory/host_vars/badges-web02.phx2.fedoraproject.org deleted file mode 100644 index 62578e47cd..0000000000 --- a/inventory/host_vars/badges-web02.phx2.fedoraproject.org +++ /dev/null @@ -1,10 +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_guests00 -eth0_ip: 10.5.126.102 -vmhost: virthost15.phx2.fedoraproject.org -datacenter: phx2 diff --git a/inventory/host_vars/basset01.phx2.fedoraproject.org b/inventory/host_vars/basset01.phx2.fedoraproject.org deleted file mode 100644 index e28ba087c5..0000000000 --- a/inventory/host_vars/basset01.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.194 -vmhost: virthost19.phx2.fedoraproject.org -datacenter: phx2 diff --git a/inventory/host_vars/bastion-comm01.qa.fedoraproject.org b/inventory/host_vars/bastion-comm01.qa.fedoraproject.org deleted file mode 100644 index 6b478a2664..0000000000 --- a/inventory/host_vars/bastion-comm01.qa.fedoraproject.org +++ /dev/null @@ -1,15 +0,0 @@ ---- -freezes: false -nm: 255.255.255.0 -gw: 10.5.124.254 -dns: 10.5.126.21 - -volgroup: /dev/VirtGuests - -eth0_ip: 10.5.124.132 -eth0_nm: 255.255.255.128 - -vmhost: virthost-comm03.qa.fedoraproject.org -datacenter: phx2 - -fas_client_groups: sysadmin-main,sysadmin-noc,sysadmin-qa,fi-apprentice,sysadmin-veteran,sysadmin-releng,sysadmin-kernel,arm-qa,sysadmin-centos,qa-automation-shell,sysadmin-troubleshoot,sysadmin-atomic,sysadmin-ppc,retrace diff --git a/inventory/host_vars/bastion01.phx2.fedoraproject.org b/inventory/host_vars/bastion01.phx2.fedoraproject.org deleted file mode 100644 index 3bb995bcba..0000000000 --- a/inventory/host_vars/bastion01.phx2.fedoraproject.org +++ /dev/null @@ -1,16 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 - -volgroup: /dev/vg_guests - -eth0_ip: 10.5.126.12 - -vmhost: virthost02.phx2.fedoraproject.org -datacenter: phx2 -vpn: true - -ssh_hostnames: -- bastion.fedoraproject.org -- bastion01.fedoraproject.org diff --git a/inventory/host_vars/bastion02.phx2.fedoraproject.org b/inventory/host_vars/bastion02.phx2.fedoraproject.org deleted file mode 100644 index 84d1f969d8..0000000000 --- a/inventory/host_vars/bastion02.phx2.fedoraproject.org +++ /dev/null @@ -1,17 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 - -volgroup: /dev/vg_guests00 - -eth0_ip: 10.5.126.11 - -vmhost: virthost21.phx2.fedoraproject.org -datacenter: phx2 -vpn: true - -ssh_hostnames: -- bastion.fedoraproject.org -- bastion02.fedoraproject.org - diff --git a/inventory/host_vars/batcave01.phx2.fedoraproject.org b/inventory/host_vars/batcave01.phx2.fedoraproject.org deleted file mode 100644 index 51b54722be..0000000000 --- a/inventory/host_vars/batcave01.phx2.fedoraproject.org +++ /dev/null @@ -1,34 +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.23 -eth1_ip: 10.5.127.13 -vmhost: virthost22.phx2.fedoraproject.org -datacenter: phx2 - -# This normally wouldn't be necessary, but when we were setting it up, -# reverse-dns was pointing elsewhere so we had to hardcode this. -fedmsg_fqdn: batcave01.phx2.fedoraproject.org - -host_backup_targets: ['/git', '/mnt/fedora/app/attachments'] - -# -# We need this to install with 2 nics -# -virt_install_command: "{{ virt_install_command_two_nic }}" - -# GDPR SAR variables - koji -sar_script: /usr/local/bin/koji_sar.py -sar_script_user: root -sar_output_file: koji.json - -# Add VPN host name as alt name for SSH cert. Useful when you need to -# SSH into batcave through VPN, like from bastion in a different DC. -ssh_hostnames: -- batcave01.vpn.fedoraproject.org diff --git a/inventory/host_vars/bkernel03.phx2.fedoraproject.org b/inventory/host_vars/bkernel03.phx2.fedoraproject.org deleted file mode 100644 index 65fefce9ab..0000000000 --- a/inventory/host_vars/bkernel03.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.81 -eth1_ip: 10.5.127.129 diff --git a/inventory/host_vars/bkernel04.phx2.fedoraproject.org b/inventory/host_vars/bkernel04.phx2.fedoraproject.org deleted file mode 100644 index 1c0fb8dc01..0000000000 --- a/inventory/host_vars/bkernel04.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.82 -eth1_ip: 10.5.127.144 diff --git a/inventory/host_vars/blockerbugs01.phx2.fedoraproject.org b/inventory/host_vars/blockerbugs01.phx2.fedoraproject.org deleted file mode 100644 index 7f4494ac79..0000000000 --- a/inventory/host_vars/blockerbugs01.phx2.fedoraproject.org +++ /dev/null @@ -1,13 +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_guests00 -eth0_ip: 10.5.126.53 -vmhost: virthost15.phx2.fedoraproject.org -datacenter: phx2 - -# This is the master node in stg, so it runs the cron job -master_blockerbugs_node: True diff --git a/inventory/host_vars/blockerbugs02.phx2.fedoraproject.org b/inventory/host_vars/blockerbugs02.phx2.fedoraproject.org deleted file mode 100644 index 36bc5bedbc..0000000000 --- a/inventory/host_vars/blockerbugs02.phx2.fedoraproject.org +++ /dev/null @@ -1,13 +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_guests00 -eth0_ip: 10.5.126.54 -vmhost: virthost15.phx2.fedoraproject.org -datacenter: phx2 - -# This is the secondary node -master_blockerbugs_node: False diff --git a/inventory/host_vars/bodhi-backend01.phx2.fedoraproject.org b/inventory/host_vars/bodhi-backend01.phx2.fedoraproject.org deleted file mode 100644 index 96ba3f5f19..0000000000 --- a/inventory/host_vars/bodhi-backend01.phx2.fedoraproject.org +++ /dev/null @@ -1,93 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.125.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-30 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/30/Server/x86_64/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.125.135 -eth1_ip: 10.5.127.61 -vmhost: bvirthost15.phx2.fedoraproject.org -mem_size: 98304 -max_mem_size: 98304 -num_cpus: 30 - -# These set a config value in /etc/fedmsg.d/, see roles/bodhi2/base/ -bodhi_masher_enabled: True -bodhi_updates_handler_enabled: False -bodhi_signed_handler_enabled: False - -# GDPR SAR variables -sar_script: /usr/bin/bodhi-sar -sar_script_user: apache -sar_output_file: bodhi.json - -# These are consumed by a task in roles/fedmsg/base/main.yml -fedmsg_certs: -# These are certs for pungi -- service: releng - owner: apache - group: sysadmin-releng - can_send: - # new school pungi-koji stuff (ask dgilmore) - - pungi.compose.phase.start - - pungi.compose.phase.stop - - pungi.compose.status.change - - pungi.compose.createiso.targets - - pungi.compose.ostree - - releng.atomic.twoweek.begin - - releng.atomic.twoweek.complete -# These are certs for the masher to publish its own messages as it progresses. -- service: bodhi - owner: root - group: apache - can_send: - - bodhi.mashtask.complete - - bodhi.mashtask.mashing - - bodhi.mashtask.start - - bodhi.mashtask.sync.done - - bodhi.mashtask.sync.wait - - bodhi.ostree.compose.start - - bodhi.ostree.compose.fail - - bodhi.ostree.compose.finish - - bodhi.errata.publish - - bodhi.update.eject - - bodhi.update.complete.testing - - bodhi.update.complete.stable - - bodhi.update.request.testing - - bodhi.update.request.stable - - bodhi.update.request.batched - - bodhi.update.karma.threshold.reach - - bodhi.buildroot_override.untag - - bodhi.update.comment - - bodhi.update.requirements_met.stable -- service: ftpsync - owner: root - group: ftpsync - can_send: - - bodhi.updates.epel.sync - - bodhi.updates.fedora.sync - - -# For the MOTD -csi_security_category: Medium -csi_primary_contact: Releng Admins sysadmin-releng-members@fedoraproject.org -csi_purpose: Run the Bodhi masher. -csi_relationship: | - The mashing of repos here happens as part of the 'fedmsg-hub' daemon. Check - logs with 'journalctl -u fedmsg-hub'. Check the bodhi masher docs/code for - more detail on what it does: - https://github.com/fedora-infra/bodhi/blob/develop/bodhi/consumers/masher.py - - * This host relies on: - * db01 for its database, which is shares with the bodhi2 frontend nodes. - * An NFS mount of koji data in /mnt/koji/ - * The fedmsg bus for triggering mashes. - * XMLRPC calls to koji for tagging and untagging updates. - * bugzilla for posting comments about status changes - * the wiki for getting information about QA "Test Cases" - * taksotron (resultsdb) for getting status-check results (gating updates). - - * No other systems rely directly on this host. Everything depends on it - indirectly for the creation of new updates repos (which get synced out to - the master mirror for distribution. diff --git a/inventory/host_vars/bodhi-backend02.phx2.fedoraproject.org b/inventory/host_vars/bodhi-backend02.phx2.fedoraproject.org deleted file mode 100644 index 495ed2bc80..0000000000 --- a/inventory/host_vars/bodhi-backend02.phx2.fedoraproject.org +++ /dev/null @@ -1,52 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.125.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-30 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/30/Server/x86_64/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.125.136 -eth1_ip: 10.5.127.62 -vmhost: bvirthost14.phx2.fedoraproject.org - -# These set a config value in /etc/fedmsg.d/, see roles/bodhi2/base/ -bodhi_masher_enabled: False -bodhi_updates_handler_enabled: True -bodhi_signed_handler_enabled: True - -# GDPR SAR variables -sar_script: /usr/bin/bodhi-sar -sar_script_user: apache -sar_output_file: bodhi.json - -# These are consumed by a task in roles/fedmsg/base/main.yml -fedmsg_certs: -- service: shell - owner: root - group: sysadmin -- service: bodhi - owner: root - group: masher - can_send: - # From the cronjob? https://github.com/fedora-infra/bodhi/issues/616 - - bodhi.buildroot_override.untag - - bodhi.update.requirements_met.stable - -# For the MOTD -csi_security_category: Low -csi_primary_contact: Bodhi Admins bodhiadmin-members@fedoraproject.org -csi_purpose: Run the Bodhi UpdatesHandler and other backend processes -csi_relationship: | - This host handles all of the bodhi backend stuff **except** for mashing. - https://github.com/fedora-infra/bodhi/blob/develop/bodhi/consumers/ - - * This host relies on: - * db01 for its database, which is shares with the bodhi2 frontend nodes. - * The fedmsg bus for triggering work. - * XMLRPC calls to koji for tagging and untagging updates. - * bugzilla for posting comments about status changes - * the wiki for getting information about QA "Test Cases" - - * No other systems rely directly on this host. Everything depends on it - indirectly for the creation of new updates repos (which get synced out to - the master mirror for distribution. diff --git a/inventory/host_vars/branched-composer.phx2.fedoraproject.org b/inventory/host_vars/branched-composer.phx2.fedoraproject.org deleted file mode 100644 index 22bb151f95..0000000000 --- a/inventory/host_vars/branched-composer.phx2.fedoraproject.org +++ /dev/null @@ -1,41 +0,0 @@ ---- -vmhost: bvirthost13.phx2.fedoraproject.org -eth0_ip: 10.5.125.66 -eth1_ip: 10.5.127.53 -volgroup: /dev/vg_guests -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-32 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/32/Server/x86_64/os/ - -koji_hub_nfs: "fedora_koji" - -kojipkgs_url: kojipkgs.fedoraproject.org -kojihub_url: koji.fedoraproject.org/kojihub -kojihub_scheme: https - -fedmsg_certs: -- service: releng - owner: root - group: sysadmin-releng - can_send: - - pungi.compose.phase.start - - pungi.compose.phase.stop - - pungi.compose.status.change - - pungi.compose.createiso.targets - - pungi.compose.createiso.imagefail - - pungi.compose.createiso.imagedone - - pungi.compose.ostree - - compose.branched.complete - - compose.branched.mash.complete - - compose.branched.mash.start - - compose.branched.image.complete - - compose.branched.image.start - - compose.branched.pungify.complete - - compose.branched.pungify.start - - compose.branched.rsync.complete - - compose.branched.rsync.start - - compose.branched.start - - compose.29.start - - compose.29.complete - - compose.29.rsync.start - - compose.29.rsync.complete - diff --git a/inventory/host_vars/bugzilla2fedmsg01.phx2.fedoraproject.org b/inventory/host_vars/bugzilla2fedmsg01.phx2.fedoraproject.org deleted file mode 100644 index f48a6a9625..0000000000 --- a/inventory/host_vars/bugzilla2fedmsg01.phx2.fedoraproject.org +++ /dev/null @@ -1,13 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 - -volgroup: /dev/vg_virthost -vmhost: virthost17.phx2.fedoraproject.org -datacenter: phx2 - -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/ - -eth0_ip: 10.5.126.249 diff --git a/inventory/host_vars/buildhw-01.phx2.fedoraproject.org b/inventory/host_vars/buildhw-01.phx2.fedoraproject.org deleted file mode 100644 index 2325c79e61..0000000000 --- a/inventory/host_vars/buildhw-01.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.164 -eth1_ip: 10.5.127.71 diff --git a/inventory/host_vars/buildhw-02.phx2.fedoraproject.org b/inventory/host_vars/buildhw-02.phx2.fedoraproject.org deleted file mode 100644 index c1e249b5c0..0000000000 --- a/inventory/host_vars/buildhw-02.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.165 -eth1_ip: 10.5.127.72 diff --git a/inventory/host_vars/buildhw-03.phx2.fedoraproject.org b/inventory/host_vars/buildhw-03.phx2.fedoraproject.org deleted file mode 100644 index f61c747610..0000000000 --- a/inventory/host_vars/buildhw-03.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.166 -eth1_ip: 10.5.127.73 diff --git a/inventory/host_vars/buildhw-04.phx2.fedoraproject.org b/inventory/host_vars/buildhw-04.phx2.fedoraproject.org deleted file mode 100644 index 146d166b9b..0000000000 --- a/inventory/host_vars/buildhw-04.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.167 -eth1_ip: 10.5.127.74 diff --git a/inventory/host_vars/buildhw-05.phx2.fedoraproject.org b/inventory/host_vars/buildhw-05.phx2.fedoraproject.org deleted file mode 100644 index 6f220d353a..0000000000 --- a/inventory/host_vars/buildhw-05.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.168 -eth1_ip: 10.5.127.75 diff --git a/inventory/host_vars/buildhw-06.phx2.fedoraproject.org b/inventory/host_vars/buildhw-06.phx2.fedoraproject.org deleted file mode 100644 index 2e82f6e024..0000000000 --- a/inventory/host_vars/buildhw-06.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.169 -eth1_ip: 10.5.127.76 diff --git a/inventory/host_vars/buildhw-07.phx2.fedoraproject.org b/inventory/host_vars/buildhw-07.phx2.fedoraproject.org deleted file mode 100644 index 3d0d502cb8..0000000000 --- a/inventory/host_vars/buildhw-07.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.170 -eth1_ip: 10.5.127.77 diff --git a/inventory/host_vars/buildhw-08.phx2.fedoraproject.org b/inventory/host_vars/buildhw-08.phx2.fedoraproject.org deleted file mode 100644 index 03a4821ea1..0000000000 --- a/inventory/host_vars/buildhw-08.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.171 -eth1_ip: 10.5.127.78 diff --git a/inventory/host_vars/buildhw-09.phx2.fedoraproject.org b/inventory/host_vars/buildhw-09.phx2.fedoraproject.org deleted file mode 100644 index 041061422d..0000000000 --- a/inventory/host_vars/buildhw-09.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.172 -eth1_ip: 10.5.127.145 diff --git a/inventory/host_vars/buildhw-10.phx2.fedoraproject.org b/inventory/host_vars/buildhw-10.phx2.fedoraproject.org deleted file mode 100644 index 97877358cd..0000000000 --- a/inventory/host_vars/buildhw-10.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.173 -eth1_ip: 10.5.127.146 diff --git a/inventory/host_vars/buildhw-11.phx2.fedoraproject.org b/inventory/host_vars/buildhw-11.phx2.fedoraproject.org deleted file mode 100644 index afb3c7004b..0000000000 --- a/inventory/host_vars/buildhw-11.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.178 -eth1_ip: 10.5.127.194 diff --git a/inventory/host_vars/buildhw-12.phx2.fedoraproject.org b/inventory/host_vars/buildhw-12.phx2.fedoraproject.org deleted file mode 100644 index 11a53528db..0000000000 --- a/inventory/host_vars/buildhw-12.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.179 -eth1_ip: 10.5.127.213 diff --git a/inventory/host_vars/buildhw-aarch64-01.arm.fedoraproject.org b/inventory/host_vars/buildhw-aarch64-01.arm.fedoraproject.org deleted file mode 100644 index 4d042a1d67..0000000000 --- a/inventory/host_vars/buildhw-aarch64-01.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -eth0_ip: 10.5.78.165 -gw: 10.5.78.254 diff --git a/inventory/host_vars/buildhw-aarch64-02.arm.fedoraproject.org b/inventory/host_vars/buildhw-aarch64-02.arm.fedoraproject.org deleted file mode 100644 index 4a0fda683f..0000000000 --- a/inventory/host_vars/buildhw-aarch64-02.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -eth0_ip: 10.5.78.170 -gw: 10.5.78.254 diff --git a/inventory/host_vars/buildhw-aarch64-03.arm.fedoraproject.org b/inventory/host_vars/buildhw-aarch64-03.arm.fedoraproject.org deleted file mode 100644 index 2a479d78ed..0000000000 --- a/inventory/host_vars/buildhw-aarch64-03.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -eth0_ip: 10.5.78.175 -gw: 10.5.78.254 diff --git a/inventory/host_vars/buildhw-aarch64-04.arm.fedoraproject.org b/inventory/host_vars/buildhw-aarch64-04.arm.fedoraproject.org deleted file mode 100644 index f6d14331cc..0000000000 --- a/inventory/host_vars/buildhw-aarch64-04.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -eth0_ip: 10.5.78.160 -gw: 10.5.78.254 diff --git a/inventory/host_vars/buildhw-aarch64-05.arm.fedoraproject.org b/inventory/host_vars/buildhw-aarch64-05.arm.fedoraproject.org deleted file mode 100644 index 4abf742ded..0000000000 --- a/inventory/host_vars/buildhw-aarch64-05.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -eth0_ip: 10.5.78.190 -gw: 10.5.78.254 diff --git a/inventory/host_vars/buildhw-aarch64-06.arm.fedoraproject.org b/inventory/host_vars/buildhw-aarch64-06.arm.fedoraproject.org deleted file mode 100644 index 920fba25be..0000000000 --- a/inventory/host_vars/buildhw-aarch64-06.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -eth0_ip: 10.5.78.70 -gw: 10.5.78.254 diff --git a/inventory/host_vars/buildhw-aarch64-07.arm.fedoraproject.org b/inventory/host_vars/buildhw-aarch64-07.arm.fedoraproject.org deleted file mode 100644 index b5fd205c7f..0000000000 --- a/inventory/host_vars/buildhw-aarch64-07.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -eth0_ip: 10.5.78.150 -gw: 10.5.78.254 diff --git a/inventory/host_vars/buildhw-aarch64-08.arm.fedoraproject.org b/inventory/host_vars/buildhw-aarch64-08.arm.fedoraproject.org deleted file mode 100644 index e10e0466e5..0000000000 --- a/inventory/host_vars/buildhw-aarch64-08.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -eth0_ip: 10.5.78.85 -gw: 10.5.78.254 diff --git a/inventory/host_vars/buildhw-aarch64-09.arm.fedoraproject.org b/inventory/host_vars/buildhw-aarch64-09.arm.fedoraproject.org deleted file mode 100644 index 647fcf843a..0000000000 --- a/inventory/host_vars/buildhw-aarch64-09.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -eth0_ip: 10.5.78.195 -gw: 10.5.78.254 diff --git a/inventory/host_vars/buildhw-aarch64-10.arm.fedoraproject.org b/inventory/host_vars/buildhw-aarch64-10.arm.fedoraproject.org deleted file mode 100644 index 0d76140104..0000000000 --- a/inventory/host_vars/buildhw-aarch64-10.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -eth0_ip: 10.5.78.80 -gw: 10.5.78.254 diff --git a/inventory/host_vars/buildvm-01.phx2.fedoraproject.org b/inventory/host_vars/buildvm-01.phx2.fedoraproject.org deleted file mode 100644 index 67ea35e3eb..0000000000 --- a/inventory/host_vars/buildvm-01.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-01.phx2.fedoraproject.org -eth0_ip: 10.5.125.98 -eth1_ip: 10.5.127.158 diff --git a/inventory/host_vars/buildvm-02.phx2.fedoraproject.org b/inventory/host_vars/buildvm-02.phx2.fedoraproject.org deleted file mode 100644 index 9a417545d2..0000000000 --- a/inventory/host_vars/buildvm-02.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-01.phx2.fedoraproject.org -eth0_ip: 10.5.125.99 -eth1_ip: 10.5.127.159 diff --git a/inventory/host_vars/buildvm-03.phx2.fedoraproject.org b/inventory/host_vars/buildvm-03.phx2.fedoraproject.org deleted file mode 100644 index 82fd2da518..0000000000 --- a/inventory/host_vars/buildvm-03.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-01.phx2.fedoraproject.org -eth0_ip: 10.5.125.100 -eth1_ip: 10.5.127.160 diff --git a/inventory/host_vars/buildvm-04.phx2.fedoraproject.org b/inventory/host_vars/buildvm-04.phx2.fedoraproject.org deleted file mode 100644 index a99b652506..0000000000 --- a/inventory/host_vars/buildvm-04.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-01.phx2.fedoraproject.org -eth0_ip: 10.5.125.101 -eth1_ip: 10.5.127.161 diff --git a/inventory/host_vars/buildvm-05.phx2.fedoraproject.org b/inventory/host_vars/buildvm-05.phx2.fedoraproject.org deleted file mode 100644 index 42f1b6c872..0000000000 --- a/inventory/host_vars/buildvm-05.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-01.phx2.fedoraproject.org -eth0_ip: 10.5.125.102 -eth1_ip: 10.5.127.162 diff --git a/inventory/host_vars/buildvm-06.phx2.fedoraproject.org b/inventory/host_vars/buildvm-06.phx2.fedoraproject.org deleted file mode 100644 index bf5155dd0b..0000000000 --- a/inventory/host_vars/buildvm-06.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-01.phx2.fedoraproject.org -eth0_ip: 10.5.125.103 -eth1_ip: 10.5.127.163 diff --git a/inventory/host_vars/buildvm-07.phx2.fedoraproject.org b/inventory/host_vars/buildvm-07.phx2.fedoraproject.org deleted file mode 100644 index 77ae09fb9d..0000000000 --- a/inventory/host_vars/buildvm-07.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-01.phx2.fedoraproject.org -eth0_ip: 10.5.125.104 -eth1_ip: 10.5.127.164 diff --git a/inventory/host_vars/buildvm-08.phx2.fedoraproject.org b/inventory/host_vars/buildvm-08.phx2.fedoraproject.org deleted file mode 100644 index f82f31ea2f..0000000000 --- a/inventory/host_vars/buildvm-08.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-01.phx2.fedoraproject.org -eth0_ip: 10.5.125.105 -eth1_ip: 10.5.127.165 diff --git a/inventory/host_vars/buildvm-09.phx2.fedoraproject.org b/inventory/host_vars/buildvm-09.phx2.fedoraproject.org deleted file mode 100644 index 64d6e08d7f..0000000000 --- a/inventory/host_vars/buildvm-09.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-02.phx2.fedoraproject.org -eth0_ip: 10.5.125.106 -eth1_ip: 10.5.127.166 diff --git a/inventory/host_vars/buildvm-10.phx2.fedoraproject.org b/inventory/host_vars/buildvm-10.phx2.fedoraproject.org deleted file mode 100644 index fde2b508fa..0000000000 --- a/inventory/host_vars/buildvm-10.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-02.phx2.fedoraproject.org -eth0_ip: 10.5.125.107 -eth1_ip: 10.5.127.167 diff --git a/inventory/host_vars/buildvm-11.phx2.fedoraproject.org b/inventory/host_vars/buildvm-11.phx2.fedoraproject.org deleted file mode 100644 index 03955cc4c4..0000000000 --- a/inventory/host_vars/buildvm-11.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-02.phx2.fedoraproject.org -eth0_ip: 10.5.125.108 -eth1_ip: 10.5.127.168 diff --git a/inventory/host_vars/buildvm-12.phx2.fedoraproject.org b/inventory/host_vars/buildvm-12.phx2.fedoraproject.org deleted file mode 100644 index 98d8fd7b32..0000000000 --- a/inventory/host_vars/buildvm-12.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-02.phx2.fedoraproject.org -eth0_ip: 10.5.125.109 -eth1_ip: 10.5.127.169 diff --git a/inventory/host_vars/buildvm-13.phx2.fedoraproject.org b/inventory/host_vars/buildvm-13.phx2.fedoraproject.org deleted file mode 100644 index 180256bb0f..0000000000 --- a/inventory/host_vars/buildvm-13.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-02.phx2.fedoraproject.org -eth0_ip: 10.5.125.110 -eth1_ip: 10.5.127.170 diff --git a/inventory/host_vars/buildvm-14.phx2.fedoraproject.org b/inventory/host_vars/buildvm-14.phx2.fedoraproject.org deleted file mode 100644 index 5636fb7628..0000000000 --- a/inventory/host_vars/buildvm-14.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-02.phx2.fedoraproject.org -eth0_ip: 10.5.125.111 -eth1_ip: 10.5.127.171 diff --git a/inventory/host_vars/buildvm-15.phx2.fedoraproject.org b/inventory/host_vars/buildvm-15.phx2.fedoraproject.org deleted file mode 100644 index d67cd4b737..0000000000 --- a/inventory/host_vars/buildvm-15.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-02.phx2.fedoraproject.org -eth0_ip: 10.5.125.112 -eth1_ip: 10.5.127.172 diff --git a/inventory/host_vars/buildvm-16.phx2.fedoraproject.org b/inventory/host_vars/buildvm-16.phx2.fedoraproject.org deleted file mode 100644 index 0f2b7765a6..0000000000 --- a/inventory/host_vars/buildvm-16.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-02.phx2.fedoraproject.org -eth0_ip: 10.5.125.113 -eth1_ip: 10.5.127.173 diff --git a/inventory/host_vars/buildvm-17.phx2.fedoraproject.org b/inventory/host_vars/buildvm-17.phx2.fedoraproject.org deleted file mode 100644 index aaee84a79a..0000000000 --- a/inventory/host_vars/buildvm-17.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-03.phx2.fedoraproject.org -eth0_ip: 10.5.125.140 -eth1_ip: 10.5.127.174 diff --git a/inventory/host_vars/buildvm-18.phx2.fedoraproject.org b/inventory/host_vars/buildvm-18.phx2.fedoraproject.org deleted file mode 100644 index 6f30f80752..0000000000 --- a/inventory/host_vars/buildvm-18.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-03.phx2.fedoraproject.org -eth0_ip: 10.5.125.141 -eth1_ip: 10.5.127.175 diff --git a/inventory/host_vars/buildvm-19.phx2.fedoraproject.org b/inventory/host_vars/buildvm-19.phx2.fedoraproject.org deleted file mode 100644 index 2aee8e7a5e..0000000000 --- a/inventory/host_vars/buildvm-19.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-03.phx2.fedoraproject.org -eth0_ip: 10.5.125.142 -eth1_ip: 10.5.127.176 diff --git a/inventory/host_vars/buildvm-20.phx2.fedoraproject.org b/inventory/host_vars/buildvm-20.phx2.fedoraproject.org deleted file mode 100644 index 0064a5a85c..0000000000 --- a/inventory/host_vars/buildvm-20.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-03.phx2.fedoraproject.org -eth0_ip: 10.5.125.143 -eth1_ip: 10.5.127.177 diff --git a/inventory/host_vars/buildvm-21.phx2.fedoraproject.org b/inventory/host_vars/buildvm-21.phx2.fedoraproject.org deleted file mode 100644 index 91d00a7d62..0000000000 --- a/inventory/host_vars/buildvm-21.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-03.phx2.fedoraproject.org -eth0_ip: 10.5.125.144 -eth1_ip: 10.5.127.178 diff --git a/inventory/host_vars/buildvm-22.phx2.fedoraproject.org b/inventory/host_vars/buildvm-22.phx2.fedoraproject.org deleted file mode 100644 index e4fd9a9c4c..0000000000 --- a/inventory/host_vars/buildvm-22.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-03.phx2.fedoraproject.org -eth0_ip: 10.5.125.145 -eth1_ip: 10.5.127.179 diff --git a/inventory/host_vars/buildvm-23.phx2.fedoraproject.org b/inventory/host_vars/buildvm-23.phx2.fedoraproject.org deleted file mode 100644 index af447b5c51..0000000000 --- a/inventory/host_vars/buildvm-23.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-03.phx2.fedoraproject.org -eth0_ip: 10.5.125.146 -eth1_ip: 10.5.127.180 diff --git a/inventory/host_vars/buildvm-24.phx2.fedoraproject.org b/inventory/host_vars/buildvm-24.phx2.fedoraproject.org deleted file mode 100644 index d9fce2eb68..0000000000 --- a/inventory/host_vars/buildvm-24.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-03.phx2.fedoraproject.org -eth0_ip: 10.5.125.147 -eth1_ip: 10.5.127.181 diff --git a/inventory/host_vars/buildvm-25.phx2.fedoraproject.org b/inventory/host_vars/buildvm-25.phx2.fedoraproject.org deleted file mode 100644 index a7a01f00d3..0000000000 --- a/inventory/host_vars/buildvm-25.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-04.phx2.fedoraproject.org -eth0_ip: 10.5.125.148 -eth1_ip: 10.5.127.182 diff --git a/inventory/host_vars/buildvm-26.phx2.fedoraproject.org b/inventory/host_vars/buildvm-26.phx2.fedoraproject.org deleted file mode 100644 index f28b55699b..0000000000 --- a/inventory/host_vars/buildvm-26.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-04.phx2.fedoraproject.org -eth0_ip: 10.5.125.149 -eth1_ip: 10.5.127.183 diff --git a/inventory/host_vars/buildvm-27.phx2.fedoraproject.org b/inventory/host_vars/buildvm-27.phx2.fedoraproject.org deleted file mode 100644 index 60ac870ac3..0000000000 --- a/inventory/host_vars/buildvm-27.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-04.phx2.fedoraproject.org -eth0_ip: 10.5.125.150 -eth1_ip: 10.5.127.184 diff --git a/inventory/host_vars/buildvm-28.phx2.fedoraproject.org b/inventory/host_vars/buildvm-28.phx2.fedoraproject.org deleted file mode 100644 index 52b6838de0..0000000000 --- a/inventory/host_vars/buildvm-28.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-04.phx2.fedoraproject.org -eth0_ip: 10.5.125.151 -eth1_ip: 10.5.127.185 diff --git a/inventory/host_vars/buildvm-29.phx2.fedoraproject.org b/inventory/host_vars/buildvm-29.phx2.fedoraproject.org deleted file mode 100644 index c1415e457d..0000000000 --- a/inventory/host_vars/buildvm-29.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-04.phx2.fedoraproject.org -eth0_ip: 10.5.125.152 -eth1_ip: 10.5.127.186 diff --git a/inventory/host_vars/buildvm-30.phx2.fedoraproject.org b/inventory/host_vars/buildvm-30.phx2.fedoraproject.org deleted file mode 100644 index d155ca2012..0000000000 --- a/inventory/host_vars/buildvm-30.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-04.phx2.fedoraproject.org -eth0_ip: 10.5.125.153 -eth1_ip: 10.5.127.187 diff --git a/inventory/host_vars/buildvm-31.phx2.fedoraproject.org b/inventory/host_vars/buildvm-31.phx2.fedoraproject.org deleted file mode 100644 index f601d56d9e..0000000000 --- a/inventory/host_vars/buildvm-31.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-04.phx2.fedoraproject.org -eth0_ip: 10.5.125.154 -eth1_ip: 10.5.127.188 diff --git a/inventory/host_vars/buildvm-32.phx2.fedoraproject.org b/inventory/host_vars/buildvm-32.phx2.fedoraproject.org deleted file mode 100644 index c02270c6c5..0000000000 --- a/inventory/host_vars/buildvm-32.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-04.phx2.fedoraproject.org -eth0_ip: 10.5.125.155 -eth1_ip: 10.5.127.189 diff --git a/inventory/host_vars/buildvm-aarch64-01.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-01.arm.fedoraproject.org deleted file mode 100644 index 850bde37bd..0000000000 --- a/inventory/host_vars/buildvm-aarch64-01.arm.fedoraproject.org +++ /dev/null @@ -1,6 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-10.arm.fedoraproject.org -eth0_ip: 10.5.129.151 -eth1_ip: 10.5.127.32 -ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-31-aarch64 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/31/Server/aarch64/os/ diff --git a/inventory/host_vars/buildvm-aarch64-02.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-02.arm.fedoraproject.org deleted file mode 100644 index 91dd412f98..0000000000 --- a/inventory/host_vars/buildvm-aarch64-02.arm.fedoraproject.org +++ /dev/null @@ -1,6 +0,0 @@ ---- -eth0_ip: 10.5.129.152 -eth1_ip: 10.5.127.33 -vmhost: buildvmhost-aarch64-10.arm.fedoraproject.org -ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-31-aarch64 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/31/Server/aarch64/os/ diff --git a/inventory/host_vars/buildvm-aarch64-03.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-03.arm.fedoraproject.org deleted file mode 100644 index 36bd1ff06c..0000000000 --- a/inventory/host_vars/buildvm-aarch64-03.arm.fedoraproject.org +++ /dev/null @@ -1,6 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-10.arm.fedoraproject.org -eth0_ip: 10.5.129.153 -eth1_ip: 10.5.127.34 -ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-31-aarch64 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/31/Server/aarch64/os/ diff --git a/inventory/host_vars/buildvm-aarch64-04.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-04.arm.fedoraproject.org deleted file mode 100644 index 0cd917bbd2..0000000000 --- a/inventory/host_vars/buildvm-aarch64-04.arm.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-11.arm.fedoraproject.org -eth0_ip: 10.5.129.154 -eth1_ip: 10.5.127.35 diff --git a/inventory/host_vars/buildvm-aarch64-05.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-05.arm.fedoraproject.org deleted file mode 100644 index 5196457004..0000000000 --- a/inventory/host_vars/buildvm-aarch64-05.arm.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-11.arm.fedoraproject.org -eth0_ip: 10.5.129.155 -eth1_ip: 10.5.127.36 diff --git a/inventory/host_vars/buildvm-aarch64-06.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-06.arm.fedoraproject.org deleted file mode 100644 index dfd4cc4a78..0000000000 --- a/inventory/host_vars/buildvm-aarch64-06.arm.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-11.arm.fedoraproject.org -eth0_ip: 10.5.129.156 -eth1_ip: 10.5.127.37 diff --git a/inventory/host_vars/buildvm-aarch64-07.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-07.arm.fedoraproject.org deleted file mode 100644 index fd7056757e..0000000000 --- a/inventory/host_vars/buildvm-aarch64-07.arm.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-12.arm.fedoraproject.org -eth0_ip: 10.5.129.157 -eth1_ip: 10.5.127.82 diff --git a/inventory/host_vars/buildvm-aarch64-08.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-08.arm.fedoraproject.org deleted file mode 100644 index a59c077623..0000000000 --- a/inventory/host_vars/buildvm-aarch64-08.arm.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-12.arm.fedoraproject.org -eth0_ip: 10.5.129.158 -eth1_ip: 10.5.127.83 diff --git a/inventory/host_vars/buildvm-aarch64-09.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-09.arm.fedoraproject.org deleted file mode 100644 index 9bbe327912..0000000000 --- a/inventory/host_vars/buildvm-aarch64-09.arm.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-12.arm.fedoraproject.org -eth0_ip: 10.5.129.159 -eth1_ip: 10.5.127.84 diff --git a/inventory/host_vars/buildvm-aarch64-10.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-10.arm.fedoraproject.org deleted file mode 100644 index d1ad2c9f23..0000000000 --- a/inventory/host_vars/buildvm-aarch64-10.arm.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-13.arm.fedoraproject.org -eth0_ip: 10.5.129.160 -eth1_ip: 10.5.127.85 diff --git a/inventory/host_vars/buildvm-aarch64-11.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-11.arm.fedoraproject.org deleted file mode 100644 index eec13c3833..0000000000 --- a/inventory/host_vars/buildvm-aarch64-11.arm.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-13.arm.fedoraproject.org -eth0_ip: 10.5.129.161 -eth1_ip: 10.5.127.86 diff --git a/inventory/host_vars/buildvm-aarch64-12.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-12.arm.fedoraproject.org deleted file mode 100644 index 807489cae9..0000000000 --- a/inventory/host_vars/buildvm-aarch64-12.arm.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-13.arm.fedoraproject.org -eth0_ip: 10.5.129.162 -eth1_ip: 10.5.127.87 diff --git a/inventory/host_vars/buildvm-aarch64-13.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-13.arm.fedoraproject.org deleted file mode 100644 index 29ce5630fa..0000000000 --- a/inventory/host_vars/buildvm-aarch64-13.arm.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-14.arm.fedoraproject.org -eth0_ip: 10.5.129.163 -eth1_ip: 10.5.127.88 diff --git a/inventory/host_vars/buildvm-aarch64-14.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-14.arm.fedoraproject.org deleted file mode 100644 index d892b6d1d8..0000000000 --- a/inventory/host_vars/buildvm-aarch64-14.arm.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-14.arm.fedoraproject.org -eth0_ip: 10.5.129.164 -eth1_ip: 10.5.127.89 diff --git a/inventory/host_vars/buildvm-aarch64-15.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-15.arm.fedoraproject.org deleted file mode 100644 index 7628ae25c6..0000000000 --- a/inventory/host_vars/buildvm-aarch64-15.arm.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-14.arm.fedoraproject.org -eth0_ip: 10.5.129.165 -eth1_ip: 10.5.127.90 diff --git a/inventory/host_vars/buildvm-aarch64-16.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-16.arm.fedoraproject.org deleted file mode 100644 index a945311a7a..0000000000 --- a/inventory/host_vars/buildvm-aarch64-16.arm.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-15.arm.fedoraproject.org -eth0_ip: 10.5.129.166 -eth1_ip: 10.5.127.91 diff --git a/inventory/host_vars/buildvm-aarch64-17.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-17.arm.fedoraproject.org deleted file mode 100644 index d175db7dca..0000000000 --- a/inventory/host_vars/buildvm-aarch64-17.arm.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-15.arm.fedoraproject.org -eth0_ip: 10.5.129.167 -eth1_ip: 10.5.127.92 diff --git a/inventory/host_vars/buildvm-aarch64-18.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-18.arm.fedoraproject.org deleted file mode 100644 index 8782dfee21..0000000000 --- a/inventory/host_vars/buildvm-aarch64-18.arm.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-15.arm.fedoraproject.org -eth0_ip: 10.5.129.168 -eth1_ip: 10.5.127.93 diff --git a/inventory/host_vars/buildvm-aarch64-19.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-19.arm.fedoraproject.org deleted file mode 100644 index e117bf364e..0000000000 --- a/inventory/host_vars/buildvm-aarch64-19.arm.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-16.arm.fedoraproject.org -eth0_ip: 10.5.129.169 -eth1_ip: 10.5.127.94 diff --git a/inventory/host_vars/buildvm-aarch64-20.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-20.arm.fedoraproject.org deleted file mode 100644 index 4cde9d8929..0000000000 --- a/inventory/host_vars/buildvm-aarch64-20.arm.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-16.arm.fedoraproject.org -eth0_ip: 10.5.129.170 -eth1_ip: 10.5.127.95 diff --git a/inventory/host_vars/buildvm-aarch64-21.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-21.arm.fedoraproject.org deleted file mode 100644 index defbcb5577..0000000000 --- a/inventory/host_vars/buildvm-aarch64-21.arm.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-16.arm.fedoraproject.org -eth0_ip: 10.5.129.171 -eth1_ip: 10.5.127.96 diff --git a/inventory/host_vars/buildvm-aarch64-22.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-22.arm.fedoraproject.org deleted file mode 100644 index fce9785157..0000000000 --- a/inventory/host_vars/buildvm-aarch64-22.arm.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-17.arm.fedoraproject.org -eth0_ip: 10.5.129.172 -eth1_ip: 10.5.127.97 diff --git a/inventory/host_vars/buildvm-aarch64-23.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-23.arm.fedoraproject.org deleted file mode 100644 index 8b412fd2e9..0000000000 --- a/inventory/host_vars/buildvm-aarch64-23.arm.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-17.arm.fedoraproject.org -eth0_ip: 10.5.129.173 -eth1_ip: 10.5.127.98 diff --git a/inventory/host_vars/buildvm-aarch64-24.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-24.arm.fedoraproject.org deleted file mode 100644 index 793d3c4dc6..0000000000 --- a/inventory/host_vars/buildvm-aarch64-24.arm.fedoraproject.org +++ /dev/null @@ -1,10 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-01.arm.fedoraproject.org -eth0_ip: 10.5.129.174 -eth1_ip: 10.5.127.99 -lvm_size: 130000 -volgroup: /dev/vg_Server -mem_size: 241664 -max_mem_size: "{{ mem_size }}" -num_cpus: 123 -# qemu-kvm: Number of SMP CPUs requested (128) exceeds max CPUs supported by machine 'mach-virt' (123) diff --git a/inventory/host_vars/buildvm-aarch64-25.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-25.arm.fedoraproject.org deleted file mode 100644 index bdd96e7bee..0000000000 --- a/inventory/host_vars/buildvm-aarch64-25.arm.fedoraproject.org +++ /dev/null @@ -1,10 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-02.arm.fedoraproject.org -eth0_ip: 10.5.129.179 -eth1_ip: 10.5.127.100 -lvm_size: 130000 -volgroup: /dev/vg_Server -mem_size: 241664 -max_mem_size: "{{ mem_size }}" -num_cpus: 123 -# qemu-kvm: Number of SMP CPUs requested (128) exceeds max CPUs supported by machine 'mach-virt' (123) diff --git a/inventory/host_vars/buildvm-armv7-01.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-01.arm.fedoraproject.org deleted file mode 100644 index 8edb1c7e3c..0000000000 --- a/inventory/host_vars/buildvm-armv7-01.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-10.arm.fedoraproject.org -eth0_ip: 10.5.129.131 diff --git a/inventory/host_vars/buildvm-armv7-02.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-02.arm.fedoraproject.org deleted file mode 100644 index 91eb7dc58d..0000000000 --- a/inventory/host_vars/buildvm-armv7-02.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-10.arm.fedoraproject.org -eth0_ip: 10.5.129.132 diff --git a/inventory/host_vars/buildvm-armv7-03.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-03.arm.fedoraproject.org deleted file mode 100644 index ead2fa0dbd..0000000000 --- a/inventory/host_vars/buildvm-armv7-03.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-10.arm.fedoraproject.org -eth0_ip: 10.5.129.133 diff --git a/inventory/host_vars/buildvm-armv7-04.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-04.arm.fedoraproject.org deleted file mode 100644 index f775348f03..0000000000 --- a/inventory/host_vars/buildvm-armv7-04.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-11.arm.fedoraproject.org -eth0_ip: 10.5.129.134 diff --git a/inventory/host_vars/buildvm-armv7-05.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-05.arm.fedoraproject.org deleted file mode 100644 index ada4fb9d08..0000000000 --- a/inventory/host_vars/buildvm-armv7-05.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-11.arm.fedoraproject.org -eth0_ip: 10.5.129.135 diff --git a/inventory/host_vars/buildvm-armv7-06.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-06.arm.fedoraproject.org deleted file mode 100644 index c360bc00ef..0000000000 --- a/inventory/host_vars/buildvm-armv7-06.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-11.arm.fedoraproject.org -eth0_ip: 10.5.129.136 diff --git a/inventory/host_vars/buildvm-armv7-07.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-07.arm.fedoraproject.org deleted file mode 100644 index b58056ce60..0000000000 --- a/inventory/host_vars/buildvm-armv7-07.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-12.arm.fedoraproject.org -eth0_ip: 10.5.129.137 diff --git a/inventory/host_vars/buildvm-armv7-08.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-08.arm.fedoraproject.org deleted file mode 100644 index 1e9e5903b1..0000000000 --- a/inventory/host_vars/buildvm-armv7-08.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-12.arm.fedoraproject.org -eth0_ip: 10.5.129.138 diff --git a/inventory/host_vars/buildvm-armv7-09.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-09.arm.fedoraproject.org deleted file mode 100644 index 41dce077c6..0000000000 --- a/inventory/host_vars/buildvm-armv7-09.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-12.arm.fedoraproject.org -eth0_ip: 10.5.129.139 diff --git a/inventory/host_vars/buildvm-armv7-10.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-10.arm.fedoraproject.org deleted file mode 100644 index 5ea3ec1efe..0000000000 --- a/inventory/host_vars/buildvm-armv7-10.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-13.arm.fedoraproject.org -eth0_ip: 10.5.129.140 diff --git a/inventory/host_vars/buildvm-armv7-11.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-11.arm.fedoraproject.org deleted file mode 100644 index 362fd7c511..0000000000 --- a/inventory/host_vars/buildvm-armv7-11.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-13.arm.fedoraproject.org -eth0_ip: 10.5.129.141 diff --git a/inventory/host_vars/buildvm-armv7-12.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-12.arm.fedoraproject.org deleted file mode 100644 index fc900ad337..0000000000 --- a/inventory/host_vars/buildvm-armv7-12.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-13.arm.fedoraproject.org -eth0_ip: 10.5.129.142 diff --git a/inventory/host_vars/buildvm-armv7-13.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-13.arm.fedoraproject.org deleted file mode 100644 index 912b8c78b1..0000000000 --- a/inventory/host_vars/buildvm-armv7-13.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-14.arm.fedoraproject.org -eth0_ip: 10.5.129.143 diff --git a/inventory/host_vars/buildvm-armv7-14.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-14.arm.fedoraproject.org deleted file mode 100644 index 1211f23843..0000000000 --- a/inventory/host_vars/buildvm-armv7-14.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-14.arm.fedoraproject.org -eth0_ip: 10.5.129.144 diff --git a/inventory/host_vars/buildvm-armv7-15.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-15.arm.fedoraproject.org deleted file mode 100644 index 64224a865e..0000000000 --- a/inventory/host_vars/buildvm-armv7-15.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-14.arm.fedoraproject.org -eth0_ip: 10.5.129.145 diff --git a/inventory/host_vars/buildvm-armv7-16.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-16.arm.fedoraproject.org deleted file mode 100644 index f4659b2f7c..0000000000 --- a/inventory/host_vars/buildvm-armv7-16.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-15.arm.fedoraproject.org -eth0_ip: 10.5.129.146 diff --git a/inventory/host_vars/buildvm-armv7-17.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-17.arm.fedoraproject.org deleted file mode 100644 index df76758795..0000000000 --- a/inventory/host_vars/buildvm-armv7-17.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-15.arm.fedoraproject.org -eth0_ip: 10.5.129.147 diff --git a/inventory/host_vars/buildvm-armv7-18.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-18.arm.fedoraproject.org deleted file mode 100644 index d14fb13aad..0000000000 --- a/inventory/host_vars/buildvm-armv7-18.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-15.arm.fedoraproject.org -eth0_ip: 10.5.129.148 diff --git a/inventory/host_vars/buildvm-armv7-19.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-19.arm.fedoraproject.org deleted file mode 100644 index 44893ece96..0000000000 --- a/inventory/host_vars/buildvm-armv7-19.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-16.arm.fedoraproject.org -eth0_ip: 10.5.129.149 diff --git a/inventory/host_vars/buildvm-armv7-20.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-20.arm.fedoraproject.org deleted file mode 100644 index fea16f5339..0000000000 --- a/inventory/host_vars/buildvm-armv7-20.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-16.arm.fedoraproject.org -eth0_ip: 10.5.129.150 diff --git a/inventory/host_vars/buildvm-armv7-21.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-21.arm.fedoraproject.org deleted file mode 100644 index cf0faeb882..0000000000 --- a/inventory/host_vars/buildvm-armv7-21.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-16.arm.fedoraproject.org -eth0_ip: 10.5.129.175 diff --git a/inventory/host_vars/buildvm-armv7-22.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-22.arm.fedoraproject.org deleted file mode 100644 index 8a65a828b4..0000000000 --- a/inventory/host_vars/buildvm-armv7-22.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-17.arm.fedoraproject.org -eth0_ip: 10.5.129.176 diff --git a/inventory/host_vars/buildvm-armv7-23.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-23.arm.fedoraproject.org deleted file mode 100644 index cb2ff304d4..0000000000 --- a/inventory/host_vars/buildvm-armv7-23.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-17.arm.fedoraproject.org -eth0_ip: 10.5.129.177 diff --git a/inventory/host_vars/buildvm-armv7-24.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-24.arm.fedoraproject.org deleted file mode 100644 index 4ae33c1c15..0000000000 --- a/inventory/host_vars/buildvm-armv7-24.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -vmhost: buildvmhost-aarch64-17.arm.fedoraproject.org -eth0_ip: 10.5.129.178 diff --git a/inventory/host_vars/buildvm-ppc64le-01.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-01.ppc.fedoraproject.org deleted file mode 100644 index dbecc97dea..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-01.ppc.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -vmhost: ppc9-01.ppc.fedoraproject.org -eth0_ip: 10.5.129.72 -eth1_ip: 10.5.127.58 -main_bridge: br0 -nfs_bridge: br1 -mem_size: 18432 -max_mem_size: 18432 diff --git a/inventory/host_vars/buildvm-ppc64le-02.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-02.ppc.fedoraproject.org deleted file mode 100644 index 896a309229..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-02.ppc.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -vmhost: ppc9-01.ppc.fedoraproject.org -eth0_ip: 10.5.129.73 -eth1_ip: 10.5.127.52 -main_bridge: br0 -nfs_bridge: br1 -mem_size: 18432 -max_mem_size: 18432 diff --git a/inventory/host_vars/buildvm-ppc64le-03.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-03.ppc.fedoraproject.org deleted file mode 100644 index 4e72a7192c..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-03.ppc.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -vmhost: ppc9-01.ppc.fedoraproject.org -eth0_ip: 10.5.129.74 -eth1_ip: 10.5.127.121 -main_bridge: br0 -nfs_bridge: br1 -mem_size: 18432 -max_mem_size: 18432 diff --git a/inventory/host_vars/buildvm-ppc64le-04.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-04.ppc.fedoraproject.org deleted file mode 100644 index 35003c15e0..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-04.ppc.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -vmhost: ppc9-01.ppc.fedoraproject.org -eth0_ip: 10.5.129.75 -eth1_ip: 10.5.127.122 -main_bridge: br0 -nfs_bridge: br1 -mem_size: 18432 -max_mem_size: 18432 diff --git a/inventory/host_vars/buildvm-ppc64le-05.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-05.ppc.fedoraproject.org deleted file mode 100644 index 99a0737af5..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-05.ppc.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -vmhost: ppc9-01.ppc.fedoraproject.org -eth0_ip: 10.5.129.76 -eth1_ip: 10.5.127.135 -main_bridge: br0 -nfs_bridge: br1 -mem_size: 18432 -max_mem_size: 18432 diff --git a/inventory/host_vars/buildvm-ppc64le-06.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-06.ppc.fedoraproject.org deleted file mode 100644 index eaa10d9167..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-06.ppc.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -vmhost: ppc9-01.ppc.fedoraproject.org -eth0_ip: 10.5.129.77 -eth1_ip: 10.5.127.106 -main_bridge: br0 -nfs_bridge: br1 -mem_size: 18432 -max_mem_size: 18432 diff --git a/inventory/host_vars/buildvm-ppc64le-07.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-07.ppc.fedoraproject.org deleted file mode 100644 index 4415823d54..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-07.ppc.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -vmhost: ppc9-01.ppc.fedoraproject.org -eth0_ip: 10.5.129.78 -eth1_ip: 10.5.127.107 -main_bridge: br0 -nfs_bridge: br1 -mem_size: 18432 -max_mem_size: 18432 diff --git a/inventory/host_vars/buildvm-ppc64le-08.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-08.ppc.fedoraproject.org deleted file mode 100644 index 043ddaad66..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-08.ppc.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -vmhost: ppc9-01.ppc.fedoraproject.org -eth0_ip: 10.5.129.79 -eth1_ip: 10.5.127.108 -main_bridge: br0 -nfs_bridge: br1 -mem_size: 18432 -max_mem_size: 18432 diff --git a/inventory/host_vars/buildvm-ppc64le-09.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-09.ppc.fedoraproject.org deleted file mode 100644 index d5bfd96ce4..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-09.ppc.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -vmhost: ppc9-01.ppc.fedoraproject.org -eth0_ip: 10.5.129.84 -eth1_ip: 10.5.127.109 -main_bridge: br0 -nfs_bridge: br1 -mem_size: 18432 -max_mem_size: 18432 diff --git a/inventory/host_vars/buildvm-ppc64le-10.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-10.ppc.fedoraproject.org deleted file mode 100644 index 8b684c2f0d..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-10.ppc.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -vmhost: ppc9-02.ppc.fedoraproject.org -eth0_ip: 10.5.129.85 -eth1_ip: 10.5.127.110 -main_bridge: br0 -nfs_bridge: br1 -mem_size: 18432 -max_mem_size: 18432 diff --git a/inventory/host_vars/buildvm-ppc64le-11.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-11.ppc.fedoraproject.org deleted file mode 100644 index 97859fcb61..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-11.ppc.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -vmhost: ppc9-02.ppc.fedoraproject.org -eth0_ip: 10.5.129.82 -eth1_ip: 10.5.127.136 -main_bridge: br0 -nfs_bridge: br1 -mem_size: 18432 -max_mem_size: 18432 diff --git a/inventory/host_vars/buildvm-ppc64le-12.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-12.ppc.fedoraproject.org deleted file mode 100644 index fd6ca824da..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-12.ppc.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -vmhost: ppc9-02.ppc.fedoraproject.org -eth0_ip: 10.5.129.83 -eth1_ip: 10.5.127.137 -main_bridge: br0 -nfs_bridge: br1 -mem_size: 18432 -max_mem_size: 18432 diff --git a/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org deleted file mode 100644 index 8d06aabb25..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -vmhost: ppc9-02.ppc.fedoraproject.org -eth0_ip: 10.5.129.86 -eth1_ip: 10.5.127.138 -main_bridge: br0 -nfs_bridge: br1 -mem_size: 18432 -max_mem_size: 18432 diff --git a/inventory/host_vars/buildvm-ppc64le-14.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-14.ppc.fedoraproject.org deleted file mode 100644 index b1f2b9f9ef..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-14.ppc.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -vmhost: ppc9-02.ppc.fedoraproject.org -eth0_ip: 10.5.129.57 -eth1_ip: 10.5.127.240 -main_bridge: br0 -nfs_bridge: br1 -mem_size: 18432 -max_mem_size: 18432 diff --git a/inventory/host_vars/buildvm-ppc64le-15.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-15.ppc.fedoraproject.org deleted file mode 100644 index 4019e31252..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-15.ppc.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -vmhost: ppc9-02.ppc.fedoraproject.org -eth0_ip: 10.5.129.58 -eth1_ip: 10.5.127.241 -main_bridge: br0 -nfs_bridge: br1 -mem_size: 18432 -max_mem_size: 18432 diff --git a/inventory/host_vars/buildvm-ppc64le-16.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-16.ppc.fedoraproject.org deleted file mode 100644 index 4b353577ff..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-16.ppc.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -vmhost: ppc9-02.ppc.fedoraproject.org -eth0_ip: 10.5.129.59 -eth1_ip: 10.5.127.242 -main_bridge: br0 -nfs_bridge: br1 -mem_size: 18432 -max_mem_size: 18432 diff --git a/inventory/host_vars/buildvm-ppc64le-17.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-17.ppc.fedoraproject.org deleted file mode 100644 index bef69b8f40..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-17.ppc.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -vmhost: ppc9-02.ppc.fedoraproject.org -eth0_ip: 10.5.129.60 -eth1_ip: 10.5.127.243 -main_bridge: br0 -nfs_bridge: br1 -mem_size: 18432 -max_mem_size: 18432 diff --git a/inventory/host_vars/buildvm-ppc64le-18.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-18.ppc.fedoraproject.org deleted file mode 100644 index 6bdbc0193d..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-18.ppc.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -vmhost: ppc9-02.ppc.fedoraproject.org -eth0_ip: 10.5.129.61 -eth1_ip: 10.5.127.244 -main_bridge: br0 -nfs_bridge: br1 -mem_size: 18432 -max_mem_size: 18432 diff --git a/inventory/host_vars/buildvm-ppc64le-19.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-19.ppc.fedoraproject.org deleted file mode 100644 index e9080af0ca..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-19.ppc.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -vmhost: ppc9-02.ppc.fedoraproject.org -eth0_ip: 10.5.129.62 -eth1_ip: 10.5.127.245 -main_bridge: br0 -nfs_bridge: br1 -mem_size: 18432 -max_mem_size: 18432 diff --git a/inventory/host_vars/buildvm-ppc64le-20.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-20.ppc.fedoraproject.org deleted file mode 100644 index 608719ca8b..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-20.ppc.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: ppc8-01.ppc.fedoraproject.org -eth0_ip: 10.5.129.63 -eth1_ip: 10.5.127.143 diff --git a/inventory/host_vars/buildvm-ppc64le-21.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-21.ppc.fedoraproject.org deleted file mode 100644 index 38a27e271d..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-21.ppc.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: ppc8-01.ppc.fedoraproject.org -eth0_ip: 10.5.129.97 -eth1_ip: 10.5.127.118 diff --git a/inventory/host_vars/buildvm-ppc64le-22.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-22.ppc.fedoraproject.org deleted file mode 100644 index 88eab7e341..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-22.ppc.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: ppc8-01.ppc.fedoraproject.org -eth0_ip: 10.5.129.98 -eth1_ip: 10.5.127.119 diff --git a/inventory/host_vars/buildvm-ppc64le-23.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-23.ppc.fedoraproject.org deleted file mode 100644 index 41804f2bc8..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-23.ppc.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: ppc8-01.ppc.fedoraproject.org -eth0_ip: 10.5.129.99 -eth1_ip: 10.5.127.120 diff --git a/inventory/host_vars/buildvm-ppc64le-24.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-24.ppc.fedoraproject.org deleted file mode 100644 index 1d439d82ca..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-24.ppc.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: ppc8-01.ppc.fedoraproject.org -eth0_ip: 10.5.129.50 -eth1_ip: 10.5.127.133 diff --git a/inventory/host_vars/buildvm-ppc64le-25.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-25.ppc.fedoraproject.org deleted file mode 100644 index e2794987f8..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-25.ppc.fedoraproject.org +++ /dev/null @@ -1,5 +0,0 @@ ---- -vmhost: ppc8-02.ppc.fedoraproject.org -eth0_ip: 10.5.129.51 -createrepo: False -virt_install_command: "{{ virt_install_command_one_nic_unsafe }} --graphics none" diff --git a/inventory/host_vars/buildvm-ppc64le-26.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-26.ppc.fedoraproject.org deleted file mode 100644 index 36d59a24bf..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-26.ppc.fedoraproject.org +++ /dev/null @@ -1,5 +0,0 @@ ---- -vmhost: ppc8-02.ppc.fedoraproject.org -eth0_ip: 10.5.129.52 -createrepo: False -virt_install_command: "{{ virt_install_command_one_nic_unsafe }} --graphics none" diff --git a/inventory/host_vars/buildvm-ppc64le-27.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-27.ppc.fedoraproject.org deleted file mode 100644 index 4dac1c77c6..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-27.ppc.fedoraproject.org +++ /dev/null @@ -1,5 +0,0 @@ ---- -vmhost: ppc8-02.ppc.fedoraproject.org -eth0_ip: 10.5.129.53 -createrepo: False -virt_install_command: "{{ virt_install_command_one_nic_unsafe }} --graphics none" diff --git a/inventory/host_vars/buildvm-ppc64le-28.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-28.ppc.fedoraproject.org deleted file mode 100644 index eb0fac7dd3..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-28.ppc.fedoraproject.org +++ /dev/null @@ -1,5 +0,0 @@ ---- -vmhost: ppc8-02.ppc.fedoraproject.org -eth0_ip: 10.5.129.54 -createrepo: False -virt_install_command: "{{ virt_install_command_one_nic_unsafe }} --graphics none" diff --git a/inventory/host_vars/buildvm-ppc64le-29.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-29.ppc.fedoraproject.org deleted file mode 100644 index b5f6691bd1..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-29.ppc.fedoraproject.org +++ /dev/null @@ -1,5 +0,0 @@ ---- -vmhost: ppc8-02.ppc.fedoraproject.org -eth0_ip: 10.5.129.55 -createrepo: False -virt_install_command: "{{ virt_install_command_one_nic_unsafe }} --graphics none" diff --git a/inventory/host_vars/buildvm-ppc64le-30.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-30.ppc.fedoraproject.org deleted file mode 100644 index e5e26b8e56..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-30.ppc.fedoraproject.org +++ /dev/null @@ -1,9 +0,0 @@ ---- -vmhost: ppc8-03.ppc.fedoraproject.org -eth0_ip: 10.5.129.30 -createrepo: False -virt_install_command: "{{ virt_install_command_one_nic_unsafe }} --graphics none" -lvm_size: 600000 -mem_size: 122880 -max_mem_size: "{{ mem_size }}" -num_cpus: 40 diff --git a/inventory/host_vars/buildvm-ppc64le-31.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-31.ppc.fedoraproject.org deleted file mode 100644 index eab87f4899..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-31.ppc.fedoraproject.org +++ /dev/null @@ -1,9 +0,0 @@ ---- -vmhost: ppc8-04.ppc.fedoraproject.org -eth0_ip: 10.5.129.31 -createrepo: False -virt_install_command: "{{ virt_install_command_one_nic_unsafe }} --graphics none" -lvm_size: 600000 -mem_size: 122880 -max_mem_size: "{{ mem_size }}" -num_cpus: 40 diff --git a/inventory/host_vars/buildvmhost-aarch64-01.arm.fedoraproject.org b/inventory/host_vars/buildvmhost-aarch64-01.arm.fedoraproject.org deleted file mode 100644 index 50dc24cd4c..0000000000 --- a/inventory/host_vars/buildvmhost-aarch64-01.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -nrpe_procs_warn: 2000 -nrpe_procs_crit: 2100 diff --git a/inventory/host_vars/buildvmhost-aarch64-02.arm.fedoraproject.org b/inventory/host_vars/buildvmhost-aarch64-02.arm.fedoraproject.org deleted file mode 100644 index 50dc24cd4c..0000000000 --- a/inventory/host_vars/buildvmhost-aarch64-02.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -nrpe_procs_warn: 2000 -nrpe_procs_crit: 2100 diff --git a/inventory/host_vars/buildvmhost-aarch64-10.arm.fedoraproject.org b/inventory/host_vars/buildvmhost-aarch64-10.arm.fedoraproject.org deleted file mode 100644 index 50dc24cd4c..0000000000 --- a/inventory/host_vars/buildvmhost-aarch64-10.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -nrpe_procs_warn: 2000 -nrpe_procs_crit: 2100 diff --git a/inventory/host_vars/buildvmhost-aarch64-11.arm.fedoraproject.org b/inventory/host_vars/buildvmhost-aarch64-11.arm.fedoraproject.org deleted file mode 100644 index 50dc24cd4c..0000000000 --- a/inventory/host_vars/buildvmhost-aarch64-11.arm.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -nrpe_procs_warn: 2000 -nrpe_procs_crit: 2100 diff --git a/inventory/host_vars/busgateway01.phx2.fedoraproject.org b/inventory/host_vars/busgateway01.phx2.fedoraproject.org deleted file mode 100644 index 00d90164d5..0000000000 --- a/inventory/host_vars/busgateway01.phx2.fedoraproject.org +++ /dev/null @@ -1,14 +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/ - -eth0_ip: 10.5.126.64 - -volgroup: /dev/vg_guests -vmhost: virthost19.phx2.fedoraproject.org - -datacenter: phx2 diff --git a/inventory/host_vars/bvirthost04.phx2.fedoraproject.org b/inventory/host_vars/bvirthost04.phx2.fedoraproject.org deleted file mode 100644 index b9b1dd45a1..0000000000 --- a/inventory/host_vars/bvirthost04.phx2.fedoraproject.org +++ /dev/null @@ -1,9 +0,0 @@ ---- -freezes: true -nested: true -dns: 10.5.126.21 -gw: 10.5.125.254 -br0_ip: 10.5.125.76 -br0_nm: 255.255.255.0 -br1_ip: 10.5.127.79 -br1_nm: 255.255.255.0 diff --git a/inventory/host_vars/bvirthost05.phx2.fedoraproject.org b/inventory/host_vars/bvirthost05.phx2.fedoraproject.org deleted file mode 100644 index 5d94e451aa..0000000000 --- a/inventory/host_vars/bvirthost05.phx2.fedoraproject.org +++ /dev/null @@ -1,9 +0,0 @@ ---- -freezes: true -nested: true -dns: 10.5.126.21 -gw: 10.5.125.254 -br0_ip: 10.5.125.121 -br0_nm: 255.255.255.0 -br1_ip: 10.5.127.123 -br1_nm: 255.255.255.0 diff --git a/inventory/host_vars/bvirthost12.phx2.fedoraproject.org b/inventory/host_vars/bvirthost12.phx2.fedoraproject.org deleted file mode 100644 index 81514dfda5..0000000000 --- a/inventory/host_vars/bvirthost12.phx2.fedoraproject.org +++ /dev/null @@ -1,9 +0,0 @@ ---- -freezes: true -nested: true -dns: 10.5.126.21 -gw: 10.5.125.254 -br0_ip: 10.5.125.10 -br0_nm: 255.255.255.0 -br1_ip: 10.5.127.225 -br1_nm: 255.255.255.0 diff --git a/inventory/host_vars/bvirthost13.phx2.fedoraproject.org b/inventory/host_vars/bvirthost13.phx2.fedoraproject.org deleted file mode 100644 index b1c57a63b1..0000000000 --- a/inventory/host_vars/bvirthost13.phx2.fedoraproject.org +++ /dev/null @@ -1,9 +0,0 @@ ---- -freezes: true -nested: true -dns: 10.5.126.21 -gw: 10.5.125.254 -br0_ip: 10.5.125.11 -br0_nm: 255.255.255.0 -br1_ip: 10.5.127.226 -br1_nm: 255.255.255.0 diff --git a/inventory/host_vars/bvirthost14.phx2.fedoraproject.org b/inventory/host_vars/bvirthost14.phx2.fedoraproject.org deleted file mode 100644 index 92ba5fabde..0000000000 --- a/inventory/host_vars/bvirthost14.phx2.fedoraproject.org +++ /dev/null @@ -1,9 +0,0 @@ ---- -freezes: true -nested: true -dns: 10.5.126.21 -gw: 10.5.125.254 -br0_ip: 10.5.125.12 -br0_nm: 255.255.255.0 -br1_ip: 10.5.127.227 -br1_nm: 255.255.255.0 diff --git a/inventory/host_vars/bvirthost15.phx2.fedoraproject.org b/inventory/host_vars/bvirthost15.phx2.fedoraproject.org deleted file mode 100644 index bff97a80ff..0000000000 --- a/inventory/host_vars/bvirthost15.phx2.fedoraproject.org +++ /dev/null @@ -1,9 +0,0 @@ ---- -freezes: true -nested: true -dns: 10.5.126.21 -gw: 10.5.125.254 -br0_ip: 10.5.125.13 -br0_nm: 255.255.255.0 -br1_ip: 10.5.127.228 -br1_nm: 255.255.255.0 diff --git a/inventory/host_vars/certgetter01.phx2.fedoraproject.org b/inventory/host_vars/certgetter01.phx2.fedoraproject.org deleted file mode 100644 index 83da790188..0000000000 --- a/inventory/host_vars/certgetter01.phx2.fedoraproject.org +++ /dev/null @@ -1,13 +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-fedora-30 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/30/Server/x86_64/os/ - -volgroup: /dev/vg_guests -eth0_ip: 10.5.126.237 -vmhost: virthost21.phx2.fedoraproject.org -datacenter: phx2 - diff --git a/inventory/host_vars/compose-iot-01.phx2.fedoraproject.org b/inventory/host_vars/compose-iot-01.phx2.fedoraproject.org deleted file mode 100644 index 2d91dcfa0f..0000000000 --- a/inventory/host_vars/compose-iot-01.phx2.fedoraproject.org +++ /dev/null @@ -1,40 +0,0 @@ ---- -volgroup: /dev/vg_guests -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-31 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/31/Everything/x86_64/os/ -virt_install_command: "{{ virt_install_command_two_nic }}" -mem_size: 32768 - -vmhost: virthost02.phx2.fedoraproject.org -eth0_ip: 10.5.126.42 -eth1_ip: 10.5.127.127 -gw: 10.5.126.254 -main_bridge: br0 -nfs_bridge: br1 - -fas_client_groups: sysadmin-releng,sysadmin-secondary - -koji_hub_nfs: "fedora_koji" - -sudoers: "{{ private }}/files/sudo/sysadmin-secondary-sudoers" - -# This VM is the compose host for IoT Edition which isn't blocking, so it doesn't freeze -freezes: false - -fedmsg_certs: -- service: releng - owner: root - group: sysadmin-releng - can_send: - # new school pungi-koji stuff (ask dgilmore) - - pungi.compose.phase.start - - pungi.compose.phase.stop - - pungi.compose.status.change - - pungi.compose.createiso.targets - - pungi.compose.createiso.imagefail - - pungi.compose.createiso.imagedone - - pungi.compose.ostree - - compose.29.complete - - compose.29.start - - compose.29.rsync.start - - compose.29.rsync.complete diff --git a/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org b/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org deleted file mode 100644 index 4a48b46b02..0000000000 --- a/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org +++ /dev/null @@ -1,70 +0,0 @@ -nm: 255.255.255.0 -gw: 10.5.125.254 -dns: 10.5.126.21 - -# -# These are 64bit -# -libdir: /usr/lib64 - -ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-31 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/31/Server/x86_64/os/ -virt_install_command: "{{ virt_install_command_two_nic }}" - -lvm_size: 30000 - -volgroup: /dev/vg_guests -eth0_ip: 10.5.125.41 -eth1_ip: 10.5.127.25 -eth1_gw: 10.5.127.254 -vmhost: bvirthost14.phx2.fedoraproject.org -datacenter: phx2 - -fas_client_groups: sysadmin-releng - -koji_hub_nfs: "fedora_koji" - -kojipkgs_url: kojipkgs.fedoraproject.org -kojihub_url: koji.fedoraproject.org/kojihub -kojihub_scheme: https - -fedmsg_certs: -- service: releng - owner: root - group: sysadmin-releng - can_send: - # two-week-atomic stuff (ask maxamillion) - - releng.atomic.twoweek.begin - - releng.atomic.twoweek.complete - # new school pungi-koji stuff (ask dgilmore) - - pungi.compose.phase.start - - pungi.compose.phase.stop - - pungi.compose.status.change - - pungi.compose.createiso.targets - - pungi.compose.createiso.imagefail - - pungi.compose.createiso.imagedone - - pungi.compose.ostree - # traditional old school compose stuff - - compose.branched.complete - - compose.branched.mash.complete - - compose.branched.mash.start - - compose.branched.image.complete - - compose.branched.image.start - - compose.branched.pungify.complete - - compose.branched.pungify.start - - compose.branched.rsync.complete - - compose.branched.rsync.start - - compose.branched.start - - compose.epelbeta.complete - - compose.rawhide.complete - - compose.rawhide.mash.complete - - compose.rawhide.mash.start - - compose.rawhide.image.complete - - compose.rawhide.image.start - - compose.rawhide.pungify.complete - - compose.rawhide.pungify.start - - compose.rawhide.rsync.complete - - compose.rawhide.rsync.start - - compose.rawhide.start - - compose.29.start - - compose.29.complete diff --git a/inventory/host_vars/data-analysis01.phx2.fedoraproject.org b/inventory/host_vars/data-analysis01.phx2.fedoraproject.org deleted file mode 100644 index 9e5e6e1b83..0000000000 --- a/inventory/host_vars/data-analysis01.phx2.fedoraproject.org +++ /dev/null @@ -1,21 +0,0 @@ ---- -# this box is not mission critical -freezes: false - -# this box mounts a large share from the netapp to store combined http -# logs from the proxies. - -nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3" - -fas_client_groups: sysadmin-main,sysadmin-analysis - -# general configs -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 -datacenter: phx2 -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 -eth0_ip: 10.5.126.121 -eth1_ip: 10.5.127.214 -tcp_ports: [80, 443, 873] diff --git a/inventory/host_vars/datagrepper01.phx2.fedoraproject.org b/inventory/host_vars/datagrepper01.phx2.fedoraproject.org deleted file mode 100644 index 1c6209424a..0000000000 --- a/inventory/host_vars/datagrepper01.phx2.fedoraproject.org +++ /dev/null @@ -1,13 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 - -volgroup: /dev/vg_guests -vmhost: virthost19.phx2.fedoraproject.org -datacenter: phx2 - -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/ - -eth0_ip: 10.5.126.18 diff --git a/inventory/host_vars/datagrepper02.phx2.fedoraproject.org b/inventory/host_vars/datagrepper02.phx2.fedoraproject.org deleted file mode 100644 index a8c8e63784..0000000000 --- a/inventory/host_vars/datagrepper02.phx2.fedoraproject.org +++ /dev/null @@ -1,13 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 - -volgroup: /dev/vg_guests -vmhost: virthost19.phx2.fedoraproject.org -datacenter: phx2 - -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/ - -eth0_ip: 10.5.126.19 diff --git a/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org b/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org deleted file mode 100644 index e314ba2111..0000000000 --- a/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org +++ /dev/null @@ -1,38 +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.111 -vmhost: virthost06.phx2.fedoraproject.org -datacenter: phx2 - -# This is a generic list, monitored by collectd -databases: -- datanommer - -# This is a more strict list, to be made publicly available -dbs_to_backup: -- datanommer - -# These are normally group variables, but in this case db servers are often different -lvm_size: 850000 -mem_size: 16384 -num_cpus: 8 -tcp_ports: [ 5432, 443 ] -fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-veteran - -# kernel SHMMAX value -kernel_shmmax: 68719476736 - -db_backup_dir: ['/backups'] -shared_buffers: "4GB" -effective_cache_size: "12GB" - -# GDPR SAR variables - datanommer/datagrepper -sar_script: /usr/local/bin/datagrepper_sar.py -sar_script_user: root -sar_output_file: datagrepper.csv -sar_huge: true diff --git a/inventory/host_vars/db-fas01.phx2.fedoraproject.org b/inventory/host_vars/db-fas01.phx2.fedoraproject.org deleted file mode 100644 index 9101c68990..0000000000 --- a/inventory/host_vars/db-fas01.phx2.fedoraproject.org +++ /dev/null @@ -1,61 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 -volgroup: /dev/vg_guests -eth0_ip: 10.5.126.99 -vmhost: virthost22.phx2.fedoraproject.org -datacenter: phx2 - -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/ - -# This is a generic list, monitored by collectd -databases: -- fas2 - -# This is a more strict list, to be made publicly available -dbs_to_backup: -- fas2 - -# These are normally group variables, but in this case db servers are often different -lvm_size: 100000 -mem_size: 16384 -num_cpus: 8 -fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-veteran - -# -# Only allow postgresql access from the frontend nodes and hosted. -# -custom_rules: [ - # fas01, fas02 - '-A INPUT -p tcp -m tcp -s 10.5.126.25 --dport 5432 -j ACCEPT', - '-A INPUT -p tcp -m tcp -s 10.5.126.26 --dport 5432 -j ACCEPT', - - # ipsilon01 and ipsilon02 - '-A INPUT -p tcp -m tcp -s 10.5.126.46 --dport 5432 -j ACCEPT', - '-A INPUT -p tcp -m tcp -s 10.5.126.47 --dport 5432 -j ACCEPT' , - - # basset01 - '-A INPUT -p tcp -m tcp -s 10.5.126.194 --dport 5432 -j ACCEPT', - - # sundries ??? but this is noc01? - '-A INPUT -p tcp -m tcp -s 10.5.126.41 --dport 5432 -j ACCEPT', - '-A INPUT -p tcp -m tcp -s 10.5.126.241 --dport 5432 -j ACCEPT', - - # Openshift nodes (egress policy will block connection from non-authorized projects) - '-A INPUT -p tcp -m tcp -s 10.5.126.248 --dport 5432 -j ACCEPT', - '-A INPUT -p tcp -m tcp -s 10.5.126.164 --dport 5432 -j ACCEPT', - '-A INPUT -p tcp -m tcp -s 10.5.126.165 --dport 5432 -j ACCEPT', - '-A INPUT -p tcp -m tcp -s 10.5.126.166 --dport 5432 -j ACCEPT', - '-A INPUT -p tcp -m tcp -s 10.5.126.167 --dport 5432 -j ACCEPT', -] -# -# Large updates pushes cause lots of db threads doing the tag moves, so up this from default. -# -nrpe_procs_warn: 600 -nrpe_procs_crit: 800 - -db_backup_dir: ['/backups'] -shared_buffers: "2GB" -effective_cache_size: "6GB" diff --git a/inventory/host_vars/db-koji01.phx2.fedoraproject.org b/inventory/host_vars/db-koji01.phx2.fedoraproject.org deleted file mode 100644 index 9797e3d7a0..0000000000 --- a/inventory/host_vars/db-koji01.phx2.fedoraproject.org +++ /dev/null @@ -1,51 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.125.254 -dns: 10.5.126.21 -volgroup: /dev/vg_guests -eth0_ip: 10.5.125.47 -vmhost: bvirthost05.phx2.fedoraproject.org -datacenter: phx2 - -ks_url: http://infrastructure.phx2.fedoraproject.org/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://infrastructure.phx2.fedoraproject.org/repo/rhel/RHEL7-x86_64/ - -# This is a generic list, monitored by collectd -databases: -- koji - -# This is a more strict list, to be made publicly available -#dbs_to_backup: -#- koji - -# These are normally group variables, but in this case db servers are often different -lvm_size: 1000000 -mem_size: 65535 -num_cpus: 64 -fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-veteran - -# kernel SHMMAX value -kernel_shmmax: 68719476736 - -# -# Only allow postgresql access from the frontend node. -# -custom_rules: [ -'-A INPUT -p tcp -m tcp -s 10.5.125.48 --dport 5432 -j ACCEPT', -'-A INPUT -p tcp -m tcp -s 10.5.125.59 --dport 5432 -j ACCEPT', -'-A INPUT -p tcp -m tcp -s 10.5.125.60 --dport 5432 -j ACCEPT', -'-A INPUT -p tcp -m tcp -s 10.5.125.61 --dport 5432 -j ACCEPT', -'-A INPUT -p tcp -m tcp -s 10.5.125.62 --dport 5432 -j ACCEPT', -'-A INPUT -p tcp -m tcp -s 10.5.126.41 --dport 5432 -j ACCEPT', -] - -# -# Large updates pushes cause lots of db threads doing the tag moves, so up this from default. -# -nrpe_procs_warn: 600 -nrpe_procs_crit: 700 - -# we backup the backup on db-koji02 now -#db_backup_dir: ['/backups'] -shared_buffers: "15GB" -effective_cache_size: "45GB" diff --git a/inventory/host_vars/db-koji02.phx2.fedoraproject.org b/inventory/host_vars/db-koji02.phx2.fedoraproject.org deleted file mode 100644 index 5b8cb4d873..0000000000 --- a/inventory/host_vars/db-koji02.phx2.fedoraproject.org +++ /dev/null @@ -1,50 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.125.254 -dns: 10.5.126.21 -volgroup: /dev/vg_guests -eth0_ip: 10.5.125.48 -vmhost: bvirthost12.phx2.fedoraproject.org -datacenter: phx2 - -ks_url: http://infrastructure.phx2.fedoraproject.org/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://infrastructure.phx2.fedoraproject.org/repo/rhel/RHEL7-x86_64/ - -# This is a generic list, monitored by collectd -databases: -- koji - -# This is a more strict list, to be made publicly available -dbs_to_backup: -- koji - -# These are normally group variables, but in this case db servers are often different -lvm_size: 1000000 -mem_size: 32768 -max_mem_size: 65536 -num_cpus: 24 -fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-veteran - -# kernel SHMMAX value -kernel_shmmax: 68719476736 - -# -# Only allow postgresql access from the frontend node. -# -custom_rules: [ -'-A INPUT -p tcp -m tcp -s 10.5.125.59 --dport 5432 -j ACCEPT', -'-A INPUT -p tcp -m tcp -s 10.5.125.60 --dport 5432 -j ACCEPT', -'-A INPUT -p tcp -m tcp -s 10.5.125.61 --dport 5432 -j ACCEPT', -'-A INPUT -p tcp -m tcp -s 10.5.125.62 --dport 5432 -j ACCEPT', -'-A INPUT -p tcp -m tcp -s 10.5.126.41 --dport 5432 -j ACCEPT', -] - -# -# Large updates pushes cause lots of db threads doing the tag moves, so up this from default. -# -nrpe_procs_warn: 600 -nrpe_procs_crit: 700 - -db_backup_dir: ['/backups'] -shared_buffers: "8GB" -effective_cache_size: "24GB" diff --git a/inventory/host_vars/db-qa01.qa.fedoraproject.org b/inventory/host_vars/db-qa01.qa.fedoraproject.org deleted file mode 100644 index 200660cc96..0000000000 --- a/inventory/host_vars/db-qa01.qa.fedoraproject.org +++ /dev/null @@ -1,56 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.124.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.124.144 -eth0_nm: 255.255.255.128 -vmhost: virthost-comm01.qa.fedoraproject.org -datacenter: phx2 - -# This is a generic list, monitored by collectd -databases: -- postgres -- buildmaster -- execdb -- openqa -- resultsdb -- vault - -# This is a more strict list, to be made publicly available -dbs_to_backup: -- postgres -- buildmaster -- buildmaster_dev -- buildmaster_stg -- execdb -- execdb_stg -- execdb_dev -# these names are also stored as host vars 'openqa_dbname', -# make sure to keep in sync -- openqa -- openqa-stg -- resultsdb -- resultsdb_stg -- resultsdb_dev -- vault_dev - -mariadb_root_password: "{{ dbqa01_mysql_root_password }}" - -# These are normally group variables, but in this case db servers are often different -lvm_size: 300000 -mem_size: 16384 -num_cpus: 10 -tcp_ports: [ 5432, 443, 3306 ] -fas_client_groups: sysadmin-qa,sysadmin-noc,sysadmin-veteran -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" - -# kernel SHMMAX value -kernel_shmmax: 68719476736 - -db_backup_dir: ['/backups'] -shared_buffers: "2GB" -effective_cache_size: "6GB" -host_backup_targets: ['/backups'] diff --git a/inventory/host_vars/db-qa02.qa.fedoraproject.org b/inventory/host_vars/db-qa02.qa.fedoraproject.org deleted file mode 100644 index d83787bc66..0000000000 --- a/inventory/host_vars/db-qa02.qa.fedoraproject.org +++ /dev/null @@ -1,37 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.124.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/VirtGuests -eth0_ip: 10.5.124.143 -eth0_nm: 255.255.255.128 -vmhost: virthost-comm03.qa.fedoraproject.org -datacenter: phx2 - -# This is a generic list, monitored by collectd -databases: -- resultsdb - -# This is a more strict list, to be made publicly available -dbs_to_backup: -- postgres -- resultsdb - -# These are normally group variables, but in this case db servers are often different -lvm_size: 300000 -mem_size: 16384 -max_mem_size: "{{ mem_size * 2 }}" -num_cpus: 6 -tcp_ports: [ 5432, 443, 3306 ] -fas_client_groups: sysadmin-qa,sysadmin-noc,sysadmin-veteran -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" - -# kernel SHMMAX value -kernel_shmmax: 68719476736 - -db_backup_dir: ['/backups'] -shared_buffers: "2GB" -effective_cache_size: "6GB" -host_backup_targets: ['/backups'] diff --git a/inventory/host_vars/db-qa03.qa.fedoraproject.org b/inventory/host_vars/db-qa03.qa.fedoraproject.org deleted file mode 100644 index 496ad02620..0000000000 --- a/inventory/host_vars/db-qa03.qa.fedoraproject.org +++ /dev/null @@ -1,36 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.131.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-28 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/28/Server/x86_64/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.131.74 -eth0_nm: 255.255.255.0 -vmhost: virthost-comm01.qa.fedoraproject.org -datacenter: phx2 - -# This is a generic list, monitored by collectd -databases: -- postgres - -# This is a more strict list, to be made publicly available -dbs_to_backup: -- postgres - -# These are normally group variables, but in this case db servers are often different -lvm_size: 300000 -mem_size: 16384 -max_mem_size: "{{ mem_size * 2 }}" -num_cpus: 6 -tcp_ports: [ 5432, 443, 3306 ] -fas_client_groups: sysadmin-qa,sysadmin-noc,sysadmin-veteran -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" - -# kernel SHMMAX value -kernel_shmmax: 68719476736 - -db_backup_dir: ['/backups'] -shared_buffers: "2GB" -effective_cache_size: "6GB" -host_backup_targets: ['/backups'] diff --git a/inventory/host_vars/db01.phx2.fedoraproject.org b/inventory/host_vars/db01.phx2.fedoraproject.org deleted file mode 100644 index 61025c49dc..0000000000 --- a/inventory/host_vars/db01.phx2.fedoraproject.org +++ /dev/null @@ -1,80 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 -volgroup: /dev/vg_guests -eth0_ip: 10.5.126.71 -vmhost: virthost06.phx2.fedoraproject.org -datacenter: phx2 - -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/ - -# This is a generic list, monitored by collectd -databases: -- askfedora -- anitya -- blockerbugs -- bodhi -- bodhi2 -- elections -- fedocal -- hyperkitty -- kerneltest -- koschei -- mailman -- mbs -- mirrormanager2 -- notifications -- nuancier_lite -- odcs -- pagure -- pdc -- tahrir -- waiverdb -- transtats - -# This is a more strict list of databases to backup every day -dbs_to_backup: -- askfedora -- anitya -- blockerbugs -- bodhi -- bodhi2 -- elections -- fedocal -- hyperkitty -- kerneltest -- koschei -- mailman -- mbs -- mirrormanager2 -- notifications -- nuancier_lite -- odcs -- pagure -- pdc -- tahrir -- waiverdb -- transtats - -# These are normally group variables, but in this case db servers are often different -lvm_size: 500000 -mem_size: 16384 -num_cpus: 10 -fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-veteran - -# -# We should narrow this down at some point -# -custom_rules: [ '-A INPUT -p tcp -m tcp --dport 5432 -j ACCEPT' ] - -# -# db01 handles lots of apps, could have many procs if they are busy. -# -nrpe_procs_warn: 800 -nrpe_procs_crit: 900 - -db_backup_dir: ['/backups'] -shared_buffers: "4GB" -effective_cache_size: "12GB" diff --git a/inventory/host_vars/db03.phx2.fedoraproject.org b/inventory/host_vars/db03.phx2.fedoraproject.org deleted file mode 100644 index 16565fde78..0000000000 --- a/inventory/host_vars/db03.phx2.fedoraproject.org +++ /dev/null @@ -1,37 +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.112 -vmhost: virthost02.phx2.fedoraproject.org -datacenter: phx2 - -# This is a generic list, monitored by collectd -databases: -- mysql -- fpo-mediawiki -- pastebin - -# This is a more strict list of db to backup to /backups -dbs_to_backup: -- fpo-mediawiki -- pastebin - -mariadb_root_password: "{{ db03_mysql_root_password }}" - -# These are normally group variables, but in this case db servers are often different -lvm_size: 300000 -mem_size: 8192 -num_cpus: 2 -tcp_ports: [ 5432, 443, 3306 ] -fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-veteran - -# kernel SHMMAX value -kernel_shmmax: 68719476736 - -db_backup_dir: ['/backups'] -shared_buffers: "4GB" -extra_enablerepos: '' diff --git a/inventory/host_vars/dell-fx01-01.phx2.fedoraproject.org b/inventory/host_vars/dell-fx01-01.phx2.fedoraproject.org deleted file mode 100644 index 2325c79e61..0000000000 --- a/inventory/host_vars/dell-fx01-01.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.164 -eth1_ip: 10.5.127.71 diff --git a/inventory/host_vars/dell-fx01-02.phx2.fedoraproject.org b/inventory/host_vars/dell-fx01-02.phx2.fedoraproject.org deleted file mode 100644 index c1e249b5c0..0000000000 --- a/inventory/host_vars/dell-fx01-02.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.165 -eth1_ip: 10.5.127.72 diff --git a/inventory/host_vars/dell-fx01-03.phx2.fedoraproject.org b/inventory/host_vars/dell-fx01-03.phx2.fedoraproject.org deleted file mode 100644 index f61c747610..0000000000 --- a/inventory/host_vars/dell-fx01-03.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.166 -eth1_ip: 10.5.127.73 diff --git a/inventory/host_vars/dell-fx01-04.phx2.fedoraproject.org b/inventory/host_vars/dell-fx01-04.phx2.fedoraproject.org deleted file mode 100644 index 146d166b9b..0000000000 --- a/inventory/host_vars/dell-fx01-04.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.167 -eth1_ip: 10.5.127.74 diff --git a/inventory/host_vars/dell-fx01-05.phx2.fedoraproject.org b/inventory/host_vars/dell-fx01-05.phx2.fedoraproject.org deleted file mode 100644 index 6f220d353a..0000000000 --- a/inventory/host_vars/dell-fx01-05.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.168 -eth1_ip: 10.5.127.75 diff --git a/inventory/host_vars/dell-fx01-06.phx2.fedoraproject.org b/inventory/host_vars/dell-fx01-06.phx2.fedoraproject.org deleted file mode 100644 index 2e82f6e024..0000000000 --- a/inventory/host_vars/dell-fx01-06.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.169 -eth1_ip: 10.5.127.76 diff --git a/inventory/host_vars/dell-fx01-07.phx2.fedoraproject.org b/inventory/host_vars/dell-fx01-07.phx2.fedoraproject.org deleted file mode 100644 index 3d0d502cb8..0000000000 --- a/inventory/host_vars/dell-fx01-07.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.170 -eth1_ip: 10.5.127.77 diff --git a/inventory/host_vars/dell-fx01-08.phx2.fedoraproject.org b/inventory/host_vars/dell-fx01-08.phx2.fedoraproject.org deleted file mode 100644 index 03a4821ea1..0000000000 --- a/inventory/host_vars/dell-fx01-08.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.171 -eth1_ip: 10.5.127.78 diff --git a/inventory/host_vars/dell-fx02-01.phx2.fedoraproject.org b/inventory/host_vars/dell-fx02-01.phx2.fedoraproject.org deleted file mode 100644 index 041061422d..0000000000 --- a/inventory/host_vars/dell-fx02-01.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.172 -eth1_ip: 10.5.127.145 diff --git a/inventory/host_vars/dell-fx02-02.phx2.fedoraproject.org b/inventory/host_vars/dell-fx02-02.phx2.fedoraproject.org deleted file mode 100644 index 97877358cd..0000000000 --- a/inventory/host_vars/dell-fx02-02.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.173 -eth1_ip: 10.5.127.146 diff --git a/inventory/host_vars/dell-fx02-03.phx2.fedoraproject.org b/inventory/host_vars/dell-fx02-03.phx2.fedoraproject.org deleted file mode 100644 index 1263d947f5..0000000000 --- a/inventory/host_vars/dell-fx02-03.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.174 -eth1_ip: 10.5.127.147 diff --git a/inventory/host_vars/dell-fx02-04.phx2.fedoraproject.org b/inventory/host_vars/dell-fx02-04.phx2.fedoraproject.org deleted file mode 100644 index 932d89bcc9..0000000000 --- a/inventory/host_vars/dell-fx02-04.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.175 -eth1_ip: 10.5.127.148 diff --git a/inventory/host_vars/dell-fx02-05.phx2.fedoraproject.org b/inventory/host_vars/dell-fx02-05.phx2.fedoraproject.org deleted file mode 100644 index 2764d07ae7..0000000000 --- a/inventory/host_vars/dell-fx02-05.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.176 -eth1_ip: 10.5.127.149 diff --git a/inventory/host_vars/dell-fx02-06.phx2.fedoraproject.org b/inventory/host_vars/dell-fx02-06.phx2.fedoraproject.org deleted file mode 100644 index 68263cbd16..0000000000 --- a/inventory/host_vars/dell-fx02-06.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.177 -eth1_ip: 10.5.127.150 diff --git a/inventory/host_vars/dell-fx02-07.phx2.fedoraproject.org b/inventory/host_vars/dell-fx02-07.phx2.fedoraproject.org deleted file mode 100644 index 38ad6f6720..0000000000 --- a/inventory/host_vars/dell-fx02-07.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.178 -eth1_ip: 10.5.127.151 diff --git a/inventory/host_vars/dell-fx02-08.phx2.fedoraproject.org b/inventory/host_vars/dell-fx02-08.phx2.fedoraproject.org deleted file mode 100644 index ba63a8aae6..0000000000 --- a/inventory/host_vars/dell-fx02-08.phx2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.179 -eth1_ip: 10.5.127.152 diff --git a/inventory/host_vars/dhcp01.phx2.fedoraproject.org b/inventory/host_vars/dhcp01.phx2.fedoraproject.org deleted file mode 100644 index 7df0c104ff..0000000000 --- a/inventory/host_vars/dhcp01.phx2.fedoraproject.org +++ /dev/null @@ -1,12 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.125.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 -vmhost: bvirthost14.phx2.fedoraproject.org -datacenter: phx2 - -eth0_ip: 10.5.125.43 diff --git a/inventory/host_vars/download01.phx2.fedoraproject.org b/inventory/host_vars/download01.phx2.fedoraproject.org deleted file mode 100644 index 8b50d0df78..0000000000 --- a/inventory/host_vars/download01.phx2.fedoraproject.org +++ /dev/null @@ -1,36 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 - -ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ - -vmhost: virthost01.phx2.fedoraproject.org -volgroup: /dev/vg_guests -# -# We need this to install with 2 nics -# -virt_install_command: "{{ virt_install_command_two_nic }}" - -eth0_ip: 10.5.126.93 -eth1_ip: 10.5.127.101 -main_bridge: br0 -nfs_bridge: br1 - -datacenter: phx2 - -tcp_ports: [80, 443, 873] -rsyncd_conf: "rsyncd.conf.download-{{ datacenter }}" - -nrpe_procs_warn: 1200 -nrpe_procs_crit: 1400 - -mem_size: 16384 -max_mem_size: 20480 -lvm_size: 20000 -num_cpus: 8 - -vpn: false - -public_hostname: dl01.fedoraproject.org diff --git a/inventory/host_vars/download02.phx2.fedoraproject.org b/inventory/host_vars/download02.phx2.fedoraproject.org deleted file mode 100644 index 7b1b9324d2..0000000000 --- a/inventory/host_vars/download02.phx2.fedoraproject.org +++ /dev/null @@ -1,36 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 - -ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ - -vmhost: virthost02.phx2.fedoraproject.org -volgroup: /dev/vg_guests -# -# We need this to install with 2 nics -# -virt_install_command: "{{ virt_install_command_two_nic }}" - -eth0_ip: 10.5.126.94 -eth1_ip: 10.5.127.102 -main_bridge: br0 -nfs_bridge: br1 - -datacenter: phx2 - -tcp_ports: [80, 443, 873] -rsyncd_conf: "rsyncd.conf.download-{{ datacenter }}" - -nrpe_procs_warn: 1200 -nrpe_procs_crit: 1400 - -mem_size: 16384 -max_mem_size: 20480 -lvm_size: 20000 -num_cpus: 8 - -vpn: false - -public_hostname: dl02.fedoraproject.org diff --git a/inventory/host_vars/download03.phx2.fedoraproject.org b/inventory/host_vars/download03.phx2.fedoraproject.org deleted file mode 100644 index 91b98f7c44..0000000000 --- a/inventory/host_vars/download03.phx2.fedoraproject.org +++ /dev/null @@ -1,36 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 - -ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ - -vmhost: virthost04.phx2.fedoraproject.org -volgroup: /dev/vg_guests -# -# We need this to install with 2 nics -# -virt_install_command: "{{ virt_install_command_two_nic }}" - -eth0_ip: 10.5.126.95 -eth1_ip: 10.5.127.103 -main_bridge: br0 -nfs_bridge: br1 - -datacenter: phx2 - -tcp_ports: [80, 443, 873] -rsyncd_conf: "rsyncd.conf.download-{{ datacenter }}" - -nrpe_procs_warn: 1200 -nrpe_procs_crit: 1400 - -mem_size: 16384 -max_mem_size: 20480 -lvm_size: 20000 -num_cpus: 8 - -vpn: false - -public_hostname: dl03.fedoraproject.org diff --git a/inventory/host_vars/download04.phx2.fedoraproject.org b/inventory/host_vars/download04.phx2.fedoraproject.org deleted file mode 100644 index 135fa2fcc6..0000000000 --- a/inventory/host_vars/download04.phx2.fedoraproject.org +++ /dev/null @@ -1,37 +0,0 @@ ---- -dns: 10.5.126.21 -gw: 10.5.126.254 -nm: 255.255.255.0 - - -ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ - -vmhost: virthost12.phx2.fedoraproject.org -volgroup: /dev/vg_guests -# -# We need this to install with 2 nics -# -virt_install_command: "{{ virt_install_command_two_nic }}" - -eth0_ip: 10.5.126.96 -eth1_ip: 10.5.127.104 -main_bridge: br0 -nfs_bridge: br1 - -datacenter: phx2 - -tcp_ports: [80, 443, 873] -rsyncd_conf: "rsyncd.conf.download-{{ datacenter }}" - -nrpe_procs_warn: 1200 -nrpe_procs_crit: 1400 - -mem_size: 16384 -max_mem_size: 20480 -lvm_size: 20000 -num_cpus: 8 - -vpn: false - -public_hostname: dl04.fedoraproject.org diff --git a/inventory/host_vars/download05.phx2.fedoraproject.org b/inventory/host_vars/download05.phx2.fedoraproject.org deleted file mode 100644 index 65b0081de5..0000000000 --- a/inventory/host_vars/download05.phx2.fedoraproject.org +++ /dev/null @@ -1,37 +0,0 @@ ---- -dns: 10.5.126.21 -gw: 10.5.126.254 -nm: 255.255.255.0 - - -ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ - -vmhost: virthost15.phx2.fedoraproject.org -volgroup: /dev/vg_guests00 -# -# We need this to install with 2 nics -# -virt_install_command: "{{ virt_install_command_two_nic }}" - -eth0_ip: 10.5.126.97 -eth1_ip: 10.5.127.105 -main_bridge: br0 -nfs_bridge: br1 - -datacenter: phx2 - -tcp_ports: [80, 443, 873] -rsyncd_conf: "rsyncd.conf.download-{{ datacenter }}" - -nrpe_procs_warn: 1200 -nrpe_procs_crit: 1400 - -mem_size: 16384 -max_mem_size: 20480 -lvm_size: 20000 -num_cpus: 8 - -vpn: false - -public_hostname: dl05.fedoraproject.org diff --git a/inventory/host_vars/fas01.phx2.fedoraproject.org b/inventory/host_vars/fas01.phx2.fedoraproject.org deleted file mode 100644 index 2bd4d88ad5..0000000000 --- a/inventory/host_vars/fas01.phx2.fedoraproject.org +++ /dev/null @@ -1,14 +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-6 -ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/ -volgroup: /dev/vg_guests00 -eth0_ip: 10.5.126.25 -vmhost: virthost15.phx2.fedoraproject.org -datacenter: phx2 - -# This is not the master production fas node, it doesn't do certs -master_fas_node: True -gen_cert: False diff --git a/inventory/host_vars/fedimg01.phx2.fedoraproject.org b/inventory/host_vars/fedimg01.phx2.fedoraproject.org deleted file mode 100644 index 860c213eac..0000000000 --- a/inventory/host_vars/fedimg01.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/ -datacenter: phx2 - -vmhost: virthost17.phx2.fedoraproject.org -volgroup: /dev/vg_virthost - -eth0_ip: 10.5.126.10 diff --git a/inventory/host_vars/fedocal01.phx2.fedoraproject.org b/inventory/host_vars/fedocal01.phx2.fedoraproject.org deleted file mode 100644 index cb83663819..0000000000 --- a/inventory/host_vars/fedocal01.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.55 -vmhost: virthost01.phx2.fedoraproject.org -datacenter: phx2 diff --git a/inventory/host_vars/fedocal02.phx2.fedoraproject.org b/inventory/host_vars/fedocal02.phx2.fedoraproject.org deleted file mode 100644 index 754dbccbfa..0000000000 --- a/inventory/host_vars/fedocal02.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.56 -vmhost: virthost06.phx2.fedoraproject.org -datacenter: phx2 - -# GDPR SAR variables -sar_script: /usr/local/bin/fedocal_sar.py -sar_script_user: apache -sar_output_file: fedocal.json diff --git a/inventory/host_vars/github2fedmsg01.phx2.fedoraproject.org b/inventory/host_vars/github2fedmsg01.phx2.fedoraproject.org deleted file mode 100644 index 417626ce0f..0000000000 --- a/inventory/host_vars/github2fedmsg01.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_guests00 -vmhost: virthost15.phx2.fedoraproject.org -datacenter: phx2 - -eth0_ip: 10.5.126.195 diff --git a/inventory/host_vars/gnome-backups01.phx2.fedoraproject.org b/inventory/host_vars/gnome-backups01.phx2.fedoraproject.org deleted file mode 100644 index ea9b13c423..0000000000 --- a/inventory/host_vars/gnome-backups01.phx2.fedoraproject.org +++ /dev/null @@ -1,23 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 -volgroup: /dev/vg_guests -eth0_ip: 10.5.126.39 -eth1_ip: 10.5.127.28 -vmhost: virthost21.phx2.fedoraproject.org -datacenter: phx2 - -ks_url: http://infrastructure.phx2.fedoraproject.org/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://infrastructure.phx2.fedoraproject.org/repo/rhel/RHEL7-x86_64/ - -# -# Need a virt-install command with eth1 also -# -virt_install_command: "{{ virt_install_command_two_nic }}" - -lvm_size: 50000 -mem_size: 8192 -num_cpus: 4 -# todo: make a gnome sysadmin group -fas_client_groups: sysadmin-gnome diff --git a/inventory/host_vars/grobisplitter01.phx2.fedoraproject.org b/inventory/host_vars/grobisplitter01.phx2.fedoraproject.org deleted file mode 100644 index 5c2b742cfe..0000000000 --- a/inventory/host_vars/grobisplitter01.phx2.fedoraproject.org +++ /dev/null @@ -1,32 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.125.254 -dns: 10.5.126.21 - -# -# These are 64bit -# -libdir: /usr/lib64 -nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4" - - -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-30 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/30/Server/x86_64/os/ -# Do this because we are using py3 only - -datacenter: phx2 -eth0_ip: 10.5.125.3 -eth1_ip: 10.5.127.6 - -lvm_size: 20000 -mem_size: 8192 -num_cpus: 6 - -fas_client_groups: sysadmin-releng,sysadmin-main - -vmhost: bvirthost14.phx2.fedoraproject.org -volgroup: /dev/vg_guests - - -virt_install_command: "{{ virt_install_command_two_nic }}" - diff --git a/inventory/host_vars/ipa01.phx2.fedoraproject.org b/inventory/host_vars/ipa01.phx2.fedoraproject.org deleted file mode 100644 index c21c57a4e5..0000000000 --- a/inventory/host_vars/ipa01.phx2.fedoraproject.org +++ /dev/null @@ -1,11 +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_guests00 -eth0_ip: 10.5.126.162 -vmhost: virthost15.phx2.fedoraproject.org -datacenter: phx2 -ipa_initial: true diff --git a/inventory/host_vars/ipa02.phx2.fedoraproject.org b/inventory/host_vars/ipa02.phx2.fedoraproject.org deleted file mode 100644 index 321b771b56..0000000000 --- a/inventory/host_vars/ipa02.phx2.fedoraproject.org +++ /dev/null @@ -1,10 +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.163 -vmhost: virthost14.phx2.fedoraproject.org -datacenter: phx2 diff --git a/inventory/host_vars/kernel02.qa.fedoraproject.org b/inventory/host_vars/kernel02.qa.fedoraproject.org deleted file mode 100644 index 03d296832c..0000000000 --- a/inventory/host_vars/kernel02.qa.fedoraproject.org +++ /dev/null @@ -1,5 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.124.254 -dns: 10.5.126.21 -eth0_ip: 10.5.124.175 diff --git a/inventory/host_vars/kernel03.qa.fedoraproject.org b/inventory/host_vars/kernel03.qa.fedoraproject.org deleted file mode 100644 index e6c850b644..0000000000 --- a/inventory/host_vars/kernel03.qa.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -ansible_ifcfg_allowlist: ['eth0'] -nm: 255.255.255.0 -gw: 10.5.124.254 -dns: 10.5.126.21 -eth0_ip: 10.5.131.177 -eth0_nm: 255.255.255.0 diff --git a/inventory/host_vars/kerneltest01.phx2.fedoraproject.org b/inventory/host_vars/kerneltest01.phx2.fedoraproject.org deleted file mode 100644 index cc2a215967..0000000000 --- a/inventory/host_vars/kerneltest01.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_virthost -vmhost: virthost17.phx2.fedoraproject.org -datacenter: phx2 - -eth0_ip: 10.5.126.136 diff --git a/inventory/host_vars/koji01.phx2.fedoraproject.org b/inventory/host_vars/koji01.phx2.fedoraproject.org deleted file mode 100644 index 5396192d11..0000000000 --- a/inventory/host_vars/koji01.phx2.fedoraproject.org +++ /dev/null @@ -1,29 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.125.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.125.61 -eth1_ip: 10.5.127.38 -vmhost: bvirthost12.phx2.fedoraproject.org -datacenter: phx2 - -# Keepalived variables -keepalived_interface: eth0 -keepalived_priority: 100 -keepalived_ipaddress: 10.5.125.63/24 -keepalived_routerid: 17 - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -fedmsg_koji_instance: primary - -koji_topurl: "https://kojipkgs.fedoraproject.org/" -koji_server_url: "https://koji.fedoraproject.org/kojihub" -koji_weburl: "https://koji.fedoraproject.org/koji" - -# we need sftp here in order to support the sshfs mount on buildvm-s390x-01 -sshd_sftp: true diff --git a/inventory/host_vars/koji02.phx2.fedoraproject.org b/inventory/host_vars/koji02.phx2.fedoraproject.org deleted file mode 100644 index 0a9905782a..0000000000 --- a/inventory/host_vars/koji02.phx2.fedoraproject.org +++ /dev/null @@ -1,26 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.125.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.125.62 -eth1_ip: 10.5.127.39 -vmhost: bvirthost13.phx2.fedoraproject.org -datacenter: phx2 - -# Keepalived variables -keepalived_interface: eth0 -keepalived_priority: 50 -keepalived_ipaddress: 10.5.125.63/24 -keepalived_routerid: 17 - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -fedmsg_koji_instance: primary - -koji_topurl: "https://kojipkgs.fedoraproject.org/" -koji_server_url: "https://koji.fedoraproject.org/kojihub" -koji_weburl: "https://koji.fedoraproject.org/koji" diff --git a/inventory/host_vars/kojipkgs01.phx2.fedoraproject.org b/inventory/host_vars/kojipkgs01.phx2.fedoraproject.org deleted file mode 100644 index d17dddf88c..0000000000 --- a/inventory/host_vars/kojipkgs01.phx2.fedoraproject.org +++ /dev/null @@ -1,18 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.125.254 -dns: 10.5.126.21 - -volgroup: /dev/vg_guests - -eth0_ip: 10.5.125.36 -eth1_ip: 10.5.127.50 - -vmhost: bvirthost12.phx2.fedoraproject.org -datacenter: phx2 - -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-31 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/31/Server/x86_64/os/ - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 diff --git a/inventory/host_vars/kojipkgs02.phx2.fedoraproject.org b/inventory/host_vars/kojipkgs02.phx2.fedoraproject.org deleted file mode 100644 index bb3c22ebfc..0000000000 --- a/inventory/host_vars/kojipkgs02.phx2.fedoraproject.org +++ /dev/null @@ -1,18 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.125.254 -dns: 10.5.126.21 - -volgroup: /dev/vg_guests - -eth0_ip: 10.5.125.35 -eth1_ip: 10.5.127.40 - -vmhost: bvirthost13.phx2.fedoraproject.org -datacenter: phx2 - -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-31 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/31/Server/x86_64/os/ - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 diff --git a/inventory/host_vars/lockbox01.phx2.fedoraproject.org b/inventory/host_vars/lockbox01.phx2.fedoraproject.org deleted file mode 100644 index 7a27ef001a..0000000000 --- a/inventory/host_vars/lockbox01.phx2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ ---- -host_backup_targets: ['/git', '/mnt/fedora/app/attachments'] diff --git a/inventory/host_vars/log01.phx2.fedoraproject.org b/inventory/host_vars/log01.phx2.fedoraproject.org deleted file mode 100644 index 05e029bcec..0000000000 --- a/inventory/host_vars/log01.phx2.fedoraproject.org +++ /dev/null @@ -1,25 +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_virthost -eth0_ip: 10.5.126.13 -eth1_ip: 10.5.127.22 -vmhost: virthost18.phx2.fedoraproject.org -datacenter: phx2 - -tcp_ports: [ 80, 443, 514, 6514 ] -udp_ports: [ 514, 25826 ] -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -lvm_size: 32768 -mem_size: 16384 -num_cpus: 16 - -fas_client_groups: fi-apprentice,sysadmin-veteran,sysadmin-logs,sysadmin-noc,sysadmin-atomic - -host_backup_targets: ['/var/log'] diff --git a/inventory/host_vars/loopabull01.phx2.fedoraproject.org b/inventory/host_vars/loopabull01.phx2.fedoraproject.org deleted file mode 100644 index 496e4d7bc4..0000000000 --- a/inventory/host_vars/loopabull01.phx2.fedoraproject.org +++ /dev/null @@ -1,10 +0,0 @@ ---- -eth0_ip: 10.5.126.33 -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_guests00 -vmhost: virthost15.phx2.fedoraproject.org -datacenter: phx2 diff --git a/inventory/host_vars/mailman01.phx2.fedoraproject.org b/inventory/host_vars/mailman01.phx2.fedoraproject.org deleted file mode 100644 index d87bd0feb0..0000000000 --- a/inventory/host_vars/mailman01.phx2.fedoraproject.org +++ /dev/null @@ -1,16 +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_virthost -eth0_ip: 10.5.126.36 -vmhost: virthost17.phx2.fedoraproject.org -datacenter: phx2 -lvm_size: 750000 - -# GDPR SAR variables -sar_script: /srv/webui/bin/mailman-sar.py -sar_script_user: apache -sar_output_file: mailinglists.json diff --git a/inventory/host_vars/mailman02.phx2.fedoraproject.org b/inventory/host_vars/mailman02.phx2.fedoraproject.org deleted file mode 100644 index ac825731b1..0000000000 --- a/inventory/host_vars/mailman02.phx2.fedoraproject.org +++ /dev/null @@ -1,10 +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_virthost -eth0_ip: 10.5.126.37 -vmhost: virthost18.phx2.fedoraproject.org -datacenter: phx2 diff --git a/inventory/host_vars/mbs-backend01.phx2.fedoraproject.org b/inventory/host_vars/mbs-backend01.phx2.fedoraproject.org deleted file mode 100644 index 78f607c412..0000000000 --- a/inventory/host_vars/mbs-backend01.phx2.fedoraproject.org +++ /dev/null @@ -1,13 +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/ - -eth0_ip: 10.5.126.236 - -volgroup: /dev/vg_guests -vmhost: virthost19.phx2.fedoraproject.org -datacenter: phx2 diff --git a/inventory/host_vars/mbs-frontend01.phx2.fedoraproject.org b/inventory/host_vars/mbs-frontend01.phx2.fedoraproject.org deleted file mode 100644 index ac4843bbdb..0000000000 --- a/inventory/host_vars/mbs-frontend01.phx2.fedoraproject.org +++ /dev/null @@ -1,13 +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/ - -eth0_ip: 10.5.126.234 - -volgroup: /dev/vg_guests -vmhost: virthost01.phx2.fedoraproject.org -datacenter: phx2 diff --git a/inventory/host_vars/mbs-frontend02.phx2.fedoraproject.org b/inventory/host_vars/mbs-frontend02.phx2.fedoraproject.org deleted file mode 100644 index 224266ba1b..0000000000 --- a/inventory/host_vars/mbs-frontend02.phx2.fedoraproject.org +++ /dev/null @@ -1,13 +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/ - -eth0_ip: 10.5.126.235 - -volgroup: /dev/vg_guests -vmhost: virthost21.phx2.fedoraproject.org -datacenter: phx2 diff --git a/inventory/host_vars/memcached01.phx2.fedoraproject.org b/inventory/host_vars/memcached01.phx2.fedoraproject.org deleted file mode 100644 index 501bbcfe60..0000000000 --- a/inventory/host_vars/memcached01.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_virthost -vmhost: virthost17.phx2.fedoraproject.org -datacenter: phx2 - -eth0_ip: 10.5.126.176 diff --git a/inventory/host_vars/memcached02.phx2.fedoraproject.org b/inventory/host_vars/memcached02.phx2.fedoraproject.org deleted file mode 100644 index 060e381997..0000000000 --- a/inventory/host_vars/memcached02.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_virthost -vmhost: virthost18.phx2.fedoraproject.org -datacenter: phx2 - -eth0_ip: 10.5.126.177 diff --git a/inventory/host_vars/noc01.phx2.fedoraproject.org b/inventory/host_vars/noc01.phx2.fedoraproject.org deleted file mode 100644 index 9b0ce59b0f..0000000000 --- a/inventory/host_vars/noc01.phx2.fedoraproject.org +++ /dev/null @@ -1,36 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 -eth0_ip: 10.5.126.41 - -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_virthost -vmhost: virthost18.phx2.fedoraproject.org -datacenter: phx2 - -tcp_ports: ['22', '80', '443', '67', '68'] -udp_ports: ['67','68','69'] -custom_rules: [ - '-A INPUT -p tcp -m tcp -s 192.168.1.20 --dport 5666 -j ACCEPT', - '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', - '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT', -] - -csi_relationship: | - noc01 is the internal monitoring nagios instance to the phx datacenter. - it is also the dhcp server serving all computing nodes - - * This host relies on: - - the virthost it's hosted on (virthost17.phx2.fedoraproject.org) - - FAS to authenticate users - - VPN connectivity - - * Things that rely on this host: - - Infrastructure team to be awair of the infra status. operations control process will fail - - if this host is down, it will be difficult to know the status of infra and provide reactive/proactive support - - if this host is down, dhcp/bootp leases/renew will fail. pxe booting will fail as well - -nagios_srcdir: 'nagios' -nagios_location: 'phx2_internal' diff --git a/inventory/host_vars/notifs-backend01.phx2.fedoraproject.org b/inventory/host_vars/notifs-backend01.phx2.fedoraproject.org deleted file mode 100644 index 96419c5522..0000000000 --- a/inventory/host_vars/notifs-backend01.phx2.fedoraproject.org +++ /dev/null @@ -1,14 +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-fedora-27 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/27/Server/x86_64/os/ - -eth0_ip: 10.5.126.168 - -volgroup: /dev/vg_guests -vmhost: virthost21.phx2.fedoraproject.org - -datacenter: phx2 diff --git a/inventory/host_vars/notifs-web01.phx2.fedoraproject.org b/inventory/host_vars/notifs-web01.phx2.fedoraproject.org deleted file mode 100644 index c936d688c4..0000000000 --- a/inventory/host_vars/notifs-web01.phx2.fedoraproject.org +++ /dev/null @@ -1,19 +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/ - -eth0_ip: 10.5.126.103 - -volgroup: /dev/vg_guests -vmhost: virthost02.phx2.fedoraproject.org - -datacenter: phx2 - -# GDPR SAR variables -sar_script: /usr/local/bin/fmn-sar.py -sar_script_user: apache -sar_output_file: fmn.json diff --git a/inventory/host_vars/notifs-web02.phx2.fedoraproject.org b/inventory/host_vars/notifs-web02.phx2.fedoraproject.org deleted file mode 100644 index 126a17f227..0000000000 --- a/inventory/host_vars/notifs-web02.phx2.fedoraproject.org +++ /dev/null @@ -1,14 +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/ - -eth0_ip: 10.5.126.119 - -volgroup: /dev/vg_guests -vmhost: virthost19.phx2.fedoraproject.org - -datacenter: phx2 diff --git a/inventory/host_vars/ns03.phx2.fedoraproject.org b/inventory/host_vars/ns03.phx2.fedoraproject.org deleted file mode 100644 index d920bdc9a0..0000000000 --- a/inventory/host_vars/ns03.phx2.fedoraproject.org +++ /dev/null @@ -1,26 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.22 - -volgroup: /dev/vg_guests - -eth0_ip: 10.5.126.21 - -vmhost: virthost21.phx2.fedoraproject.org -datacenter: phx2 - -csi_relationship: | - - ns03 is a master dns server. - It serves about every domain under fedoraproject, fedo*, as well as others, both forward and reverse. - - * This host relies on: - - The virthost it's hosted on (virthost21.phx2.fedoraproject.org) - - batcave for dns git and keys - - connectivity to maxmind to create geoIP dns acl - - * Things that rely on this host: - - The Internet/Community to resolve everything related to fedora and reverse-IP for allocated subnets - - If this host is down, dns queries will slow down by the portion of this host to the total name servers responsible for the same domain set. - - secodary/slave dns servers diff --git a/inventory/host_vars/ns04.phx2.fedoraproject.org b/inventory/host_vars/ns04.phx2.fedoraproject.org deleted file mode 100644 index 1279af13e0..0000000000 --- a/inventory/host_vars/ns04.phx2.fedoraproject.org +++ /dev/null @@ -1,26 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 - -volgroup: /dev/vg_guests00 - -eth0_ip: 10.5.126.22 - -vmhost: virthost15.phx2.fedoraproject.org -datacenter: phx2 - -csi_relationship: | - - ns04 is a master dns server. - It serves about every domain under fedoraproject, fedo*, as well as others, both forward and reverse. - - * This host relies on: - - The virthost it's hosted on (virthost15.phx2.fedoraproject.org) - - batcave for dns git and keys - - connectivity to maxmind to create geoIP dns acl - - * Things that rely on this host: - - The Internet/Community to resolve everything related to fedora and reverse-IP for allocated subnets - - If this host is down, dns queries will slow down by the portion of this host to the total name servers responsible for the same domain set. - - secodary/slave dns servers diff --git a/inventory/host_vars/nuancier01.phx2.fedoraproject.org b/inventory/host_vars/nuancier01.phx2.fedoraproject.org deleted file mode 100644 index 57c8fdab49..0000000000 --- a/inventory/host_vars/nuancier01.phx2.fedoraproject.org +++ /dev/null @@ -1,21 +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.231 -vmhost: virthost01.phx2.fedoraproject.org -datacenter: phx2 - -host_backup_targets: ['/var/cache/nuancier'] - - -# GDPR SAR variables - nuancier -sar_script: /usr/local/bin/nuancier_sar.py -sar_script_user: apache -sar_output_file: nuancier.json - diff --git a/inventory/host_vars/nuancier02.phx2.fedoraproject.org b/inventory/host_vars/nuancier02.phx2.fedoraproject.org deleted file mode 100644 index 9ab480394f..0000000000 --- a/inventory/host_vars/nuancier02.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.232 -vmhost: virthost21.phx2.fedoraproject.org -datacenter: phx2 diff --git a/inventory/host_vars/oci-candidate-registry01.phx2.fedoraproject.org b/inventory/host_vars/oci-candidate-registry01.phx2.fedoraproject.org deleted file mode 100644 index b94c0decde..0000000000 --- a/inventory/host_vars/oci-candidate-registry01.phx2.fedoraproject.org +++ /dev/null @@ -1,18 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.125.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-30 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/30/Server/x86_64/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.125.57 -vmhost: bvirthost01.phx2.fedoraproject.org -datacenter: phx2 - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -lvm_size: 120g -mem_size: 16384 -max_mem_size: 16384 -num_cpus: 4 diff --git a/inventory/host_vars/oci-registry01.phx2.fedoraproject.org b/inventory/host_vars/oci-registry01.phx2.fedoraproject.org deleted file mode 100644 index 305ca28d81..0000000000 --- a/inventory/host_vars/oci-registry01.phx2.fedoraproject.org +++ /dev/null @@ -1,18 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.125.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-30 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/30/Server/x86_64/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.125.77 -vmhost: bvirthost04.phx2.fedoraproject.org -datacenter: phx2 - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -lvm_size: 120g -mem_size: 8192 -max_mem_size: 16384 -num_cpus: 4 diff --git a/inventory/host_vars/oci-registry02.phx2.fedoraproject.org b/inventory/host_vars/oci-registry02.phx2.fedoraproject.org deleted file mode 100644 index 29002e8558..0000000000 --- a/inventory/host_vars/oci-registry02.phx2.fedoraproject.org +++ /dev/null @@ -1,18 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.125.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-30 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/30/Server/x86_64/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.125.78 -vmhost: bvirthost01.phx2.fedoraproject.org -datacenter: phx2 - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -lvm_size: 120g -mem_size: 8192 -max_mem_size: 16384 -num_cpus: 4 diff --git a/inventory/host_vars/odcs-backend-releng01.phx2.fedoraproject.org b/inventory/host_vars/odcs-backend-releng01.phx2.fedoraproject.org deleted file mode 100644 index e1b3efbd91..0000000000 --- a/inventory/host_vars/odcs-backend-releng01.phx2.fedoraproject.org +++ /dev/null @@ -1,19 +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-fedora-30 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/30/Server/x86_64/os/ - -eth0_ip: 10.5.126.66 -eth1_ip: 10.5.127.221 - -volgroup: /dev/vg_guests -vmhost: virthost04.phx2.fedoraproject.org - -datacenter: phx2 - -lvm_size: 200000 -mem_size: 65536 -num_cpus: 16 diff --git a/inventory/host_vars/odcs-backend01.phx2.fedoraproject.org b/inventory/host_vars/odcs-backend01.phx2.fedoraproject.org deleted file mode 100644 index 3876cefd99..0000000000 --- a/inventory/host_vars/odcs-backend01.phx2.fedoraproject.org +++ /dev/null @@ -1,15 +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-fedora-30 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/30/Server/x86_64/os/ - -eth0_ip: 10.5.126.65 -eth1_ip: 10.5.127.114 - -volgroup: /dev/vg_guests -vmhost: virthost19.phx2.fedoraproject.org - -datacenter: phx2 diff --git a/inventory/host_vars/odcs-frontend01.phx2.fedoraproject.org b/inventory/host_vars/odcs-frontend01.phx2.fedoraproject.org deleted file mode 100644 index bc79bd80ec..0000000000 --- a/inventory/host_vars/odcs-frontend01.phx2.fedoraproject.org +++ /dev/null @@ -1,15 +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-fedora-30 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/30/Server/x86_64/os/ - -eth0_ip: 10.5.126.29 -eth1_ip: 10.5.127.128 - -volgroup: /dev/vg_guests -vmhost: virthost01.phx2.fedoraproject.org - -datacenter: phx2 diff --git a/inventory/host_vars/openqa-aarch64-01.qa.fedoraproject.org b/inventory/host_vars/openqa-aarch64-01.qa.fedoraproject.org deleted file mode 100644 index dfd879acff..0000000000 --- a/inventory/host_vars/openqa-aarch64-01.qa.fedoraproject.org +++ /dev/null @@ -1,37 +0,0 @@ ---- -freezes: false -# eth0 is on the .arm. network. eth1 is on the .qa. network -ansible_ifcfg_infra_net_devices: ['eth0', 'eth1'] -gw: 10.5.131.254 -dns: 10.5.126.21 -eth1_ip: 10.5.131.25 -eth1_nm: 255.255.255.0 -datacenter: phx2 -fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran -nrpe_procs_warn: 250 -nrpe_procs_crit: 300 - -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" - -# openQA tap worker hosts (like this one) do stuff with ifcfg that base -# doesn't understand. terrible, terrible stuff. seriously - it doesn't -# handle the openvswitch config well. so let's tell it to just configure -# the regular interfaces (which on this system is eth0-eth2) for us, -# disabling all but the one we want to use (eth0), and leave everything -# else alone. We use a variable definition here so the firewall config -# (in the openqa_tap_workers group_vars) can reuse it. -openqa_tap_iface: eth1 -ansible_ifcfg_allowlist: ['eth0', '{{ openqa_tap_iface }}', 'eth2'] -ansible_ifcfg_disabled: ['eth0', 'eth2'] - -# this is a powerful machine, can handle more openQA workers -openqa_workers: 8 -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083'] - -# has an HW RNG, so let's have rngd -openqa_rngd: True diff --git a/inventory/host_vars/openqa-aarch64-02.qa.fedoraproject.org b/inventory/host_vars/openqa-aarch64-02.qa.fedoraproject.org deleted file mode 100644 index e5beb184e2..0000000000 --- a/inventory/host_vars/openqa-aarch64-02.qa.fedoraproject.org +++ /dev/null @@ -1,41 +0,0 @@ ---- -freezes: false -# eth0 is on the .arm. network. eth1 is on the .qa. network -ansible_ifcfg_infra_net_devices: ['eth0', 'eth1'] -gw: 10.5.131.254 -dns: 10.5.126.21 -eth1_ip: 10.5.131.26 -eth1_nm: 255.255.255.0 -datacenter: phx2 -fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran -nrpe_procs_warn: 250 -nrpe_procs_crit: 300 - -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" - -# we seem to have an eth2 plugged in that isn't configured here, -# which breaks "copy ifcfg files - non virthost" role -ansible_ifcfg_allowlist: ['eth0', 'eth1'] -# we just want the eth1 (qa network) interface active -ansible_ifcfg_disabled: ['eth0'] - -# this is a powerful machine, can handle more openQA workers -openqa_workers: 8 -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083'] - -# has an HW RNG, so let's have rngd -openqa_rngd: True - -# FIXME this box is suffering from a mysterious bug that prevents VMs -# working properly: -# https://pagure.io/fedora-infrastructure/issue/8750 -# this means all openQA tests run on it fail. We cannot currently work -# out why this is happening, so until we can, we will give it a special -# worker class that prevents it picking up regular jobs, but allows us -# to manually target it with jobs for debugging -openqa_worker_class: aarch64-02-broken diff --git a/inventory/host_vars/openqa-aarch64-03.qa.fedoraproject.org b/inventory/host_vars/openqa-aarch64-03.qa.fedoraproject.org deleted file mode 100644 index 76c980dfc9..0000000000 --- a/inventory/host_vars/openqa-aarch64-03.qa.fedoraproject.org +++ /dev/null @@ -1,32 +0,0 @@ ---- -freezes: false -# eth0 is on the .arm. network. eth1 is on the .qa. network -ansible_ifcfg_infra_net_devices: ['eth0', 'eth1'] -gw: 10.5.131.254 -dns: 10.5.126.21 -eth1_ip: 10.5.131.27 -eth1_nm: 255.255.255.0 -datacenter: phx2 -fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran -nrpe_procs_warn: 250 -nrpe_procs_crit: 300 - -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" - -# we seem to have an eth2 plugged in that isn't configured here, -# which breaks "copy ifcfg files - non virthost" role -ansible_ifcfg_allowlist: ['eth0', 'eth1'] -# we just want the eth1 (qa network) interface active -ansible_ifcfg_disabled: ['eth0'] - -# this is a powerful machine, can handle more openQA workers -openqa_workers: 8 -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083'] - -# has an HW RNG, so let's have rngd -openqa_rngd: True diff --git a/inventory/host_vars/openqa-ppc64le-01.qa.fedoraproject.org b/inventory/host_vars/openqa-ppc64le-01.qa.fedoraproject.org deleted file mode 100644 index f8b21ebabd..0000000000 --- a/inventory/host_vars/openqa-ppc64le-01.qa.fedoraproject.org +++ /dev/null @@ -1,35 +0,0 @@ ---- -freezes: false -# the if connected to the infra network on this box is eth2, not eth0 -ansible_ifcfg_infra_net_devices: [ 'eth2' ] -gw: 10.5.131.254 -dns: 10.5.126.21 -eth2_ip: 10.5.131.73 -eth2_nm: 255.255.255.0 -datacenter: phx2 -fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran -nrpe_procs_warn: 250 -nrpe_procs_crit: 300 - -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" - -# openQA tap worker hosts (like this one) do stuff with ifcfg that base -# doesn't understand. terrible, terrible stuff. seriously - it doesn't -# handle the openvswitch config well. so let's tell it to just configure -# the regular interfaces (which on this system is eth0-eth3) for us, -# disabling all but the one we want to use (eth2), and leave everything -# else alone. -ansible_ifcfg_allowlist: ['eth0', 'eth1', 'eth2', 'eth3'] -ansible_ifcfg_disabled: ['eth0', 'eth1', 'eth3'] - -# this is a powerful machine, can handle more openQA workers -openqa_workers: 8 -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083'] - -# has an HW RNG, so let's have rngd -openqa_rngd: True diff --git a/inventory/host_vars/openqa-ppc64le-02.qa.fedoraproject.org b/inventory/host_vars/openqa-ppc64le-02.qa.fedoraproject.org deleted file mode 100644 index aa4a615a68..0000000000 --- a/inventory/host_vars/openqa-ppc64le-02.qa.fedoraproject.org +++ /dev/null @@ -1,37 +0,0 @@ ---- -freezes: false -# the if connected to the infra network on this box is eth2, not eth0 -ansible_ifcfg_infra_net_devices: [ 'eth2' ] -gw: 10.5.131.254 -dns: 10.5.126.21 -eth2_ip: 10.5.131.75 -eth2_nm: 255.255.255.0 -datacenter: phx2 -fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran -nrpe_procs_warn: 250 -nrpe_procs_crit: 300 - -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" - -# openQA tap worker hosts (like this one) do stuff with ifcfg that base -# doesn't understand. terrible, terrible stuff. seriously - it doesn't -# handle the openvswitch config well. so let's tell it to just configure -# the regular interfaces (which on this system is eth0-eth3) for us, -# disabling all but the one we want to use (eth2), and leave everything -# else alone. We use a variable definition here so the firewall config -# (in the openqa_tap_workers group_vars) can reuse it. -openqa_tap_iface: eth2 -ansible_ifcfg_allowlist: ['eth0', 'eth1', '{{ openqa_tap_iface }}', 'eth3'] -ansible_ifcfg_disabled: ['eth0', 'eth1', 'eth3'] - -# this is a powerful machine, can handle more openQA workers -openqa_workers: 15 -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153'] - -# has an HW RNG, so let's have rngd -openqa_rngd: True diff --git a/inventory/host_vars/openqa-ppc64le-03.qa.fedoraproject.org b/inventory/host_vars/openqa-ppc64le-03.qa.fedoraproject.org deleted file mode 100644 index a8753d5e84..0000000000 --- a/inventory/host_vars/openqa-ppc64le-03.qa.fedoraproject.org +++ /dev/null @@ -1,35 +0,0 @@ ---- -freezes: false -# the if connected to the infra network on this box is eth2, not eth0 -ansible_ifcfg_infra_net_devices: [ 'eth2' ] -gw: 10.5.131.254 -dns: 10.5.126.21 -eth2_ip: 10.5.131.76 -eth2_nm: 255.255.255.0 -datacenter: phx2 -fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran -nrpe_procs_warn: 250 -nrpe_procs_crit: 300 - -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" - -# openQA tap worker hosts (like this one) do stuff with ifcfg that base -# doesn't understand. terrible, terrible stuff. seriously - it doesn't -# handle the openvswitch config well. so let's tell it to just configure -# the regular interfaces (which on this system is eth0-eth3) for us, -# disabling all but the one we want to use (eth2), and leave everything -# else alone. -ansible_ifcfg_allowlist: ['eth0', 'eth1', 'eth2', 'eth3'] -ansible_ifcfg_disabled: ['eth0', 'eth1', 'eth3'] - -# this is a powerful machine, can handle more openQA workers -openqa_workers: 15 -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153'] - -# has an HW RNG, so let's have rngd -openqa_rngd: True diff --git a/inventory/host_vars/openqa-stg01.qa.fedoraproject.org b/inventory/host_vars/openqa-stg01.qa.fedoraproject.org deleted file mode 100644 index fb1d11de9c..0000000000 --- a/inventory/host_vars/openqa-stg01.qa.fedoraproject.org +++ /dev/null @@ -1,32 +0,0 @@ ---- -############################################################ -# networking -############################################################ - -nm: 255.255.255.0 -gw: 10.5.131.254 -dns: 10.5.126.21 -eth0_ip: 10.5.131.72 - -############################################################ -# install -############################################################ - -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-31-openqa -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/31/Server/x86_64/os/ -volgroup: /dev/vg_guests -vmhost: virthost-comm04.qa.fedoraproject.org -datacenter: phx2 - -############################################################ -# virtual machine -############################################################ - -fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran - -lvm_size: 768000 -mem_size: 4096 -num_cpus: 4 - -nrpe_procs_warn: 250 -nrpe_procs_crit: 300 diff --git a/inventory/host_vars/openqa01.qa.fedoraproject.org b/inventory/host_vars/openqa01.qa.fedoraproject.org deleted file mode 100644 index 789e10d22c..0000000000 --- a/inventory/host_vars/openqa01.qa.fedoraproject.org +++ /dev/null @@ -1,32 +0,0 @@ ---- -############################################################ -# networking -############################################################ - -nm: 255.255.255.0 -gw: 10.5.131.254 -dns: 10.5.126.21 -eth0_ip: 10.5.131.71 - -############################################################ -# install -############################################################ - -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-30-openqa -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/30/Server/x86_64/os/ -volgroup: /dev/VirtGuests -vmhost: virthost-comm03.qa.fedoraproject.org -datacenter: phx2 - -############################################################ -# virtual machine -############################################################ - -fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran - -lvm_size: 768000 -mem_size: 4096 -num_cpus: 4 - -nrpe_procs_warn: 250 -nrpe_procs_crit: 300 diff --git a/inventory/host_vars/os-control01.phx2.fedoraproject.org b/inventory/host_vars/os-control01.phx2.fedoraproject.org deleted file mode 100644 index 33a636d004..0000000000 --- a/inventory/host_vars/os-control01.phx2.fedoraproject.org +++ /dev/null @@ -1,14 +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.244 -vmhost: virthost06.phx2.fedoraproject.org -datacenter: phx2 - -baseiptables: true diff --git a/inventory/host_vars/os-master01.phx2.fedoraproject.org b/inventory/host_vars/os-master01.phx2.fedoraproject.org deleted file mode 100644 index 1f422df527..0000000000 --- a/inventory/host_vars/os-master01.phx2.fedoraproject.org +++ /dev/null @@ -1,19 +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-osbs -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.126.245 -vmhost: virthost06.phx2.fedoraproject.org -datacenter: phx2 -host_group: os - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -lvm_size: 120g -mem_size: 16384 -max_mem_size: 16384 -num_cpus: 4 diff --git a/inventory/host_vars/os-master02.phx2.fedoraproject.org b/inventory/host_vars/os-master02.phx2.fedoraproject.org deleted file mode 100644 index a2b9372e4b..0000000000 --- a/inventory/host_vars/os-master02.phx2.fedoraproject.org +++ /dev/null @@ -1,19 +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-osbs -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.126.246 -vmhost: virthost19.phx2.fedoraproject.org -datacenter: phx2 -host_group: os - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -lvm_size: 120g -mem_size: 16384 -max_mem_size: 16384 -num_cpus: 4 diff --git a/inventory/host_vars/os-master03.phx2.fedoraproject.org b/inventory/host_vars/os-master03.phx2.fedoraproject.org deleted file mode 100644 index ad3e853cb6..0000000000 --- a/inventory/host_vars/os-master03.phx2.fedoraproject.org +++ /dev/null @@ -1,19 +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-osbs -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ -volgroup: /dev/vg_guests00 -eth0_ip: 10.5.126.247 -vmhost: virthost15.phx2.fedoraproject.org -datacenter: phx2 -host_group: os - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -lvm_size: 120g -mem_size: 16384 -max_mem_size: 16384 -num_cpus: 4 diff --git a/inventory/host_vars/os-node01.phx2.fedoraproject.org b/inventory/host_vars/os-node01.phx2.fedoraproject.org deleted file mode 100644 index 8d9644850b..0000000000 --- a/inventory/host_vars/os-node01.phx2.fedoraproject.org +++ /dev/null @@ -1,18 +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-osbs -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.126.248 -vmhost: virthost06.phx2.fedoraproject.org -datacenter: phx2 - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -lvm_size: 120g -mem_size: 16384 -max_mem_size: 16384 -num_cpus: 4 diff --git a/inventory/host_vars/os-node02.phx2.fedoraproject.org b/inventory/host_vars/os-node02.phx2.fedoraproject.org deleted file mode 100644 index 5bc643a15b..0000000000 --- a/inventory/host_vars/os-node02.phx2.fedoraproject.org +++ /dev/null @@ -1,18 +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-osbs -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.126.164 -vmhost: virthost19.phx2.fedoraproject.org -datacenter: phx2 - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -lvm_size: 120g -mem_size: 16384 -max_mem_size: 16384 -num_cpus: 4 diff --git a/inventory/host_vars/os-node03.phx2.fedoraproject.org b/inventory/host_vars/os-node03.phx2.fedoraproject.org deleted file mode 100644 index 8300ea5a27..0000000000 --- a/inventory/host_vars/os-node03.phx2.fedoraproject.org +++ /dev/null @@ -1,18 +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-osbs -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.126.165 -vmhost: virthost01.phx2.fedoraproject.org -datacenter: phx2 - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -lvm_size: 120g -mem_size: 16384 -max_mem_size: 16384 -num_cpus: 4 diff --git a/inventory/host_vars/os-node04.phx2.fedoraproject.org b/inventory/host_vars/os-node04.phx2.fedoraproject.org deleted file mode 100644 index 4a5b41bb76..0000000000 --- a/inventory/host_vars/os-node04.phx2.fedoraproject.org +++ /dev/null @@ -1,18 +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-osbs -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.126.166 -vmhost: virthost12.phx2.fedoraproject.org -datacenter: phx2 - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -lvm_size: 120g -mem_size: 16384 -max_mem_size: 16384 -num_cpus: 4 diff --git a/inventory/host_vars/os-node05.phx2.fedoraproject.org b/inventory/host_vars/os-node05.phx2.fedoraproject.org deleted file mode 100644 index f794b5ccf6..0000000000 --- a/inventory/host_vars/os-node05.phx2.fedoraproject.org +++ /dev/null @@ -1,18 +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-osbs -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.126.167 -vmhost: virthost14.phx2.fedoraproject.org -datacenter: phx2 - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -lvm_size: 120g -mem_size: 16384 -max_mem_size: 16384 -num_cpus: 4 diff --git a/inventory/host_vars/osbs-aarch64-master01.arm.fedoraproject.org b/inventory/host_vars/osbs-aarch64-master01.arm.fedoraproject.org deleted file mode 100644 index 49b0759f4e..0000000000 --- a/inventory/host_vars/osbs-aarch64-master01.arm.fedoraproject.org +++ /dev/null @@ -1,21 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.129.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-28-aarch64-osbs -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/28/Server/aarch64/os/ -volgroup: /dev/vg_Server -eth0_ip: 10.5.129.33 -mac_address: 52:54:00:7f:73:01 -vmhost: aarch64-c22n1.arm.fedoraproject.org -datacenter: phx2 -host_group: osbs-aarch64-masters - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -lvm_size: 120g -mem_size: 16384 -max_mem_size: 16384 -num_cpus: 4 - diff --git a/inventory/host_vars/osbs-control01.phx2.fedoraproject.org b/inventory/host_vars/osbs-control01.phx2.fedoraproject.org deleted file mode 100644 index 664fdec6b3..0000000000 --- a/inventory/host_vars/osbs-control01.phx2.fedoraproject.org +++ /dev/null @@ -1,19 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.125.254 -dns: 10.5.125.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.125.58 -vmhost: bvirthost01.phx2.fedoraproject.org -datacenter: phx2 - -mem_size: 4096 -max_mem_size: 4096 - -nagios_Check_Services: - nrpe: false - mail: false diff --git a/inventory/host_vars/osbs-master01.phx2.fedoraproject.org b/inventory/host_vars/osbs-master01.phx2.fedoraproject.org deleted file mode 100644 index 647ae2d61d..0000000000 --- a/inventory/host_vars/osbs-master01.phx2.fedoraproject.org +++ /dev/null @@ -1,18 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.125.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-28-osbs -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/28/Server/x86_64/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.125.55 -vmhost: bvirthost01.phx2.fedoraproject.org -datacenter: phx2 - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -lvm_size: 120g -mem_size: 16384 -max_mem_size: 16384 -num_cpus: 4 diff --git a/inventory/host_vars/osbs-node01.phx2.fedoraproject.org b/inventory/host_vars/osbs-node01.phx2.fedoraproject.org deleted file mode 100644 index a26a25e8d8..0000000000 --- a/inventory/host_vars/osbs-node01.phx2.fedoraproject.org +++ /dev/null @@ -1,18 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.125.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-28-osbs -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/28/Server/x86_64/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.125.53 -vmhost: bvirthost01.phx2.fedoraproject.org -datacenter: phx2 - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -lvm_size: 120g -mem_size: 16384 -max_mem_size: 16384 -num_cpus: 4 diff --git a/inventory/host_vars/osbs-node02.phx2.fedoraproject.org b/inventory/host_vars/osbs-node02.phx2.fedoraproject.org deleted file mode 100644 index 6a2e756d55..0000000000 --- a/inventory/host_vars/osbs-node02.phx2.fedoraproject.org +++ /dev/null @@ -1,18 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.125.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-28-osbs -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/28/Server/x86_64/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.125.54 -vmhost: bvirthost01.phx2.fedoraproject.org -datacenter: phx2 - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -lvm_size: 120g -mem_size: 16384 -max_mem_size: 16384 -num_cpus: 4 diff --git a/inventory/host_vars/packages03.phx2.fedoraproject.org b/inventory/host_vars/packages03.phx2.fedoraproject.org deleted file mode 100644 index 274bf03779..0000000000 --- a/inventory/host_vars/packages03.phx2.fedoraproject.org +++ /dev/null @@ -1,15 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 - -eth0_ip: 10.5.126.43 - -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-29 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/29/Server/x86_64/os/ - -volgroup: /dev/vg_guests -vmhost: virthost14.phx2.fedoraproject.org -datacenter: phx2 - -install_packages_indexer: True diff --git a/inventory/host_vars/packages04.phx2.fedoraproject.org b/inventory/host_vars/packages04.phx2.fedoraproject.org deleted file mode 100644 index 26f2824ae2..0000000000 --- a/inventory/host_vars/packages04.phx2.fedoraproject.org +++ /dev/null @@ -1,15 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 - -eth0_ip: 10.5.126.44 - -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-29 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/29/Server/x86_64/os/ - -volgroup: /dev/vg_guests -vmhost: virthost12.phx2.fedoraproject.org -datacenter: phx2 - -install_packages_indexer: False diff --git a/inventory/host_vars/pdc-backend01.phx2.fedoraproject.org b/inventory/host_vars/pdc-backend01.phx2.fedoraproject.org deleted file mode 100644 index 827235f61f..0000000000 --- a/inventory/host_vars/pdc-backend01.phx2.fedoraproject.org +++ /dev/null @@ -1,18 +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/ - -eth0_ip: 10.5.126.134 - -volgroup: /dev/vg_guests -vmhost: virthost14.phx2.fedoraproject.org -datacenter: phx2 - -# These people get told when something goes wrong. -fedmsg_error_recipients: -- ralph@fedoraproject.org -- mohanboddu@fedoraproject.org diff --git a/inventory/host_vars/pdc-backend02.phx2.fedoraproject.org b/inventory/host_vars/pdc-backend02.phx2.fedoraproject.org deleted file mode 100644 index 3adbb0cd9c..0000000000 --- a/inventory/host_vars/pdc-backend02.phx2.fedoraproject.org +++ /dev/null @@ -1,20 +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/ - -eth0_ip: 10.5.126.239 - -volgroup: /dev/vg_guests -vmhost: virthost22.phx2.fedoraproject.org -datacenter: phx2 - -# These people get told when something goes wrong. -fedmsg_error_recipients: -- ralph@fedoraproject.org -- mprahl@redhat.com -- jkaluza@redhat.com -- fvalder@redhat.com diff --git a/inventory/host_vars/pdc-backend03.phx2.fedoraproject.org b/inventory/host_vars/pdc-backend03.phx2.fedoraproject.org deleted file mode 100644 index 5f69d64486..0000000000 --- a/inventory/host_vars/pdc-backend03.phx2.fedoraproject.org +++ /dev/null @@ -1,20 +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/ - -eth0_ip: 10.5.126.242 - -volgroup: /dev/vg_guests -vmhost: virthost22.phx2.fedoraproject.org -datacenter: phx2 - -# These people get told when something goes wrong. -fedmsg_error_recipients: -- ralph@fedoraproject.org -- mprahl@redhat.com -- jkaluza@redhat.com -- fvalder@redhat.com diff --git a/inventory/host_vars/pdc-web01.phx2.fedoraproject.org b/inventory/host_vars/pdc-web01.phx2.fedoraproject.org deleted file mode 100644 index 8214fea6b4..0000000000 --- a/inventory/host_vars/pdc-web01.phx2.fedoraproject.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 - -ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ - -eth0_ip: 10.5.126.131 - -volgroup: /dev/vg_guests -vmhost: virthost22.phx2.fedoraproject.org -datacenter: phx2 -mem_size: 16384 diff --git a/inventory/host_vars/pdc-web02.phx2.fedoraproject.org b/inventory/host_vars/pdc-web02.phx2.fedoraproject.org deleted file mode 100644 index 02a683c83a..0000000000 --- a/inventory/host_vars/pdc-web02.phx2.fedoraproject.org +++ /dev/null @@ -1,13 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 - -ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ - -eth0_ip: 10.5.126.132 - -volgroup: /dev/vg_guests -vmhost: virthost21.phx2.fedoraproject.org -datacenter: phx2 diff --git a/inventory/host_vars/pkgs02.phx2.fedoraproject.org b/inventory/host_vars/pkgs02.phx2.fedoraproject.org deleted file mode 100644 index e5b2006c47..0000000000 --- a/inventory/host_vars/pkgs02.phx2.fedoraproject.org +++ /dev/null @@ -1,38 +0,0 @@ ---- -eth0_ip: 10.5.125.44 -eth1_ip: 10.5.127.69 -nm: 255.255.255.0 -gw: 10.5.125.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 -vmhost: bvirthost04.phx2.fedoraproject.org -datacenter: phx2 - -mem_size: 16384 -num_cpus: 8 - -# Need a eth0/eth1 install here. -virt_install_command: "{{ virt_install_command_two_nic }}" - -host_backup_targets: ['/srv/cache/lookaside'] -nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3" - -ssh_hostnames: -- pkgs.fedoraproject.org - -additional_host_keytabs: -- pkgs.fedoraproject.org - -nrpe_procs_warn: 500 -nrpe_procs_crit: 600 - -# GDPR SAR variables - dist_dit -sar_script: /usr/local/bin/pagure_sar.py -sar_script_user: root -sar_output_file: dist_git.json - -# DB used by pagure -pagure_db_host: db01.phx2.fedoraproject.org - diff --git a/inventory/host_vars/ppc8-01.ppc.fedoraproject.org b/inventory/host_vars/ppc8-01.ppc.fedoraproject.org deleted file mode 100644 index 50dc24cd4c..0000000000 --- a/inventory/host_vars/ppc8-01.ppc.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -nrpe_procs_warn: 2000 -nrpe_procs_crit: 2100 diff --git a/inventory/host_vars/ppc8-02.ppc.fedoraproject.org b/inventory/host_vars/ppc8-02.ppc.fedoraproject.org deleted file mode 100644 index 50dc24cd4c..0000000000 --- a/inventory/host_vars/ppc8-02.ppc.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -nrpe_procs_warn: 2000 -nrpe_procs_crit: 2100 diff --git a/inventory/host_vars/ppc8-03.ppc.fedoraproject.org b/inventory/host_vars/ppc8-03.ppc.fedoraproject.org deleted file mode 100644 index 50dc24cd4c..0000000000 --- a/inventory/host_vars/ppc8-03.ppc.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -nrpe_procs_warn: 2000 -nrpe_procs_crit: 2100 diff --git a/inventory/host_vars/ppc8-04.ppc.fedoraproject.org b/inventory/host_vars/ppc8-04.ppc.fedoraproject.org deleted file mode 100644 index 50dc24cd4c..0000000000 --- a/inventory/host_vars/ppc8-04.ppc.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -nrpe_procs_warn: 2000 -nrpe_procs_crit: 2100 diff --git a/inventory/host_vars/ppc9-01.ppc.fedoraproject.org b/inventory/host_vars/ppc9-01.ppc.fedoraproject.org deleted file mode 100644 index ed97d539c0..0000000000 --- a/inventory/host_vars/ppc9-01.ppc.fedoraproject.org +++ /dev/null @@ -1 +0,0 @@ ---- diff --git a/inventory/host_vars/ppc9-02.ppc.fedoraproject.org b/inventory/host_vars/ppc9-02.ppc.fedoraproject.org deleted file mode 100644 index ed97d539c0..0000000000 --- a/inventory/host_vars/ppc9-02.ppc.fedoraproject.org +++ /dev/null @@ -1 +0,0 @@ ---- diff --git a/inventory/host_vars/proxy01.phx2.fedoraproject.org b/inventory/host_vars/proxy01.phx2.fedoraproject.org deleted file mode 100644 index 03f16b0687..0000000000 --- a/inventory/host_vars/proxy01.phx2.fedoraproject.org +++ /dev/null @@ -1,22 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 -num_cpus: 8 - -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-31 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/31/Server/x86_64/os/ - -vmhost: virthost21.phx2.fedoraproject.org -volgroup: /dev/vg_guests - -eth0_ip: 10.5.126.52 -eth0_secondary_ip: 10.5.126.30 - -# This is consumed by the roles/fedora-web/main role -sponsor: redhat - -nrpe_procs_warn: 1200 -nrpe_procs_crit: 1400 - -vpn: true diff --git a/inventory/host_vars/proxy10.phx2.fedoraproject.org b/inventory/host_vars/proxy10.phx2.fedoraproject.org deleted file mode 100644 index 6e3b830ec5..0000000000 --- a/inventory/host_vars/proxy10.phx2.fedoraproject.org +++ /dev/null @@ -1,22 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 -num_cpus: 8 - -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-31 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/31/Server/x86_64/os/ - -vmhost: virthost17.phx2.fedoraproject.org -volgroup: /dev/vg_virthost - -eth0_ip: 10.5.126.51 -eth0_secondary_ip: 10.5.126.26 - -# This is consumed by the roles/fedora-web/main role -sponsor: redhat - -nrpe_procs_warn: 1200 -nrpe_procs_crit: 1400 - -vpn: true diff --git a/inventory/host_vars/proxy101.phx2.fedoraproject.org b/inventory/host_vars/proxy101.phx2.fedoraproject.org deleted file mode 100644 index bd64e8ac16..0000000000 --- a/inventory/host_vars/proxy101.phx2.fedoraproject.org +++ /dev/null @@ -1,20 +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-fedora-31 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/31/Server/x86_64/os/ - -vmhost: virthost06.phx2.fedoraproject.org -volgroup: /dev/vg_guests - -eth0_ip: 10.5.126.8 - -# This is consumed by the roles/fedora-web/main role -sponsor: redhat - -nrpe_procs_warn: 1200 -nrpe_procs_crit: 1400 - -vpn: true diff --git a/inventory/host_vars/proxy110.phx2.fedoraproject.org b/inventory/host_vars/proxy110.phx2.fedoraproject.org deleted file mode 100644 index d55f3fa453..0000000000 --- a/inventory/host_vars/proxy110.phx2.fedoraproject.org +++ /dev/null @@ -1,20 +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-fedora-31 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/31/Server/x86_64/os/ - -vmhost: virthost19.phx2.fedoraproject.org -volgroup: /dev/vg_guests - -eth0_ip: 10.5.126.9 - -# This is consumed by the roles/fedora-web/main role -sponsor: redhat - -nrpe_procs_warn: 1200 -nrpe_procs_crit: 1400 - -vpn: true diff --git a/inventory/host_vars/qa01.qa.fedoraproject.org b/inventory/host_vars/qa01.qa.fedoraproject.org deleted file mode 100644 index 295e37af12..0000000000 --- a/inventory/host_vars/qa01.qa.fedoraproject.org +++ /dev/null @@ -1,37 +0,0 @@ ---- -freezes: false -fas_client_groups: sysadmin-qa,sysadmin-main -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" - -nrpe_procs_warn: 1400 -nrpe_procs_crit: 1600 - -# the if connected to the infra network on this box is em3, not eth0 -ansible_ifcfg_infra_net_devices: [ 'em3' ] -em3_ip: 10.5.124.151 -em3_nm: 255.255.255.0 -gw: 10.5.124.254 - -# openQA tap worker hosts (like this one) do stuff with ifcfg that base -# doesn't understand. terrible, terrible stuff. seriously - it doesn't -# handle the openvswitch config well. so let's tell it to just configure -# the regular interfaces (which on this system is em1-4) for us, -# disabling all but the one we want to use (em3), and leave everything -# else alone. We use a variable definition here so the firewall config -# (in the openqa_tap_workers group_vars) can reuse it. -openqa_tap_iface: em3 -ansible_ifcfg_allowlist: ['em1', 'em2', '{{ openqa_tap_iface }}', 'em4'] -ansible_ifcfg_disabled: ['em1', 'em2', 'em4'] - -# Has a hardware RNG -openqa_rngd: True - -# this is a powerful machine, can handle more openQA workers -openqa_workers: 30 -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153', '20163', '20173', '20183', '20193', '20203', '20213', '20223', '20233', '20243', '20253', '20263', '20273', '20283', '20293', '20303'] - diff --git a/inventory/host_vars/qa02.qa.fedoraproject.org b/inventory/host_vars/qa02.qa.fedoraproject.org deleted file mode 100644 index f6d90663e0..0000000000 --- a/inventory/host_vars/qa02.qa.fedoraproject.org +++ /dev/null @@ -1,36 +0,0 @@ ---- -freezes: false -fas_client_groups: sysadmin-qa,sysadmin-main -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" - -nrpe_procs_warn: 1400 -nrpe_procs_crit: 1600 - -# the if connected to the infra network on this box is em3, not eth0 -ansible_ifcfg_infra_net_devices: [ 'em3' ] -em3_ip: 10.5.124.152 -em3_nm: 255.255.255.0 -gw: 10.5.124.254 - -# openQA tap worker hosts (like this one) do stuff with ifcfg that base -# doesn't understand. terrible, terrible stuff. seriously - it doesn't -# handle the openvswitch config well. so let's tell it to just configure -# the regular interfaces (which on this system is em1-4) for us, -# disabling all but the one we want to use (em3), and leave everything -# else alone. We use a variable definition here so the firewall config -# (in the openqa_tap_workers group_vars) can reuse it. -openqa_tap_iface: em3 -ansible_ifcfg_allowlist: ['em1', 'em2', '{{ openqa_tap_iface }}', 'em4'] -ansible_ifcfg_disabled: ['em1', 'em2', 'em4'] - -# Has a hardware RNG -openqa_rngd: True - -# this is a powerful machine, can handle more openQA workers -openqa_workers: 30 -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153', '20163', '20173', '20183', '20193', '20203', '20213', '20223', '20233', '20243', '20253', '20263', '20273', '20283', '20293', '20303'] diff --git a/inventory/host_vars/qa05.qa.fedoraproject.org b/inventory/host_vars/qa05.qa.fedoraproject.org deleted file mode 100644 index fd7466d510..0000000000 --- a/inventory/host_vars/qa05.qa.fedoraproject.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -fas_client_groups: sysadmin-qa,sysadmin-main -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" -eth0_ip: 10.5.124.155 -gw: 10.5.124.254 -# this interface is plugged in but we don't want or need it -ansible_ifcfg_disabled: ['eth1'] - -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043'] diff --git a/inventory/host_vars/qa06.qa.fedoraproject.org b/inventory/host_vars/qa06.qa.fedoraproject.org deleted file mode 100644 index 4cf2798810..0000000000 --- a/inventory/host_vars/qa06.qa.fedoraproject.org +++ /dev/null @@ -1,5 +0,0 @@ ---- -fas_client_groups: sysadmin-qa,sysadmin-main -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" -eth0_ip: 10.5.124.156 -gw: 10.5.124.254 diff --git a/inventory/host_vars/qa07.qa.fedoraproject.org b/inventory/host_vars/qa07.qa.fedoraproject.org deleted file mode 100644 index 398d0f1ef1..0000000000 --- a/inventory/host_vars/qa07.qa.fedoraproject.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -fas_client_groups: sysadmin-qa,sysadmin-main -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" -eth0_ip: 10.5.124.157 -gw: 10.5.124.254 -# this interface is plugged in but we don't want or need it -ansible_ifcfg_disabled: ['eth1'] - -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043'] diff --git a/inventory/host_vars/qa09.qa.fedoraproject.org b/inventory/host_vars/qa09.qa.fedoraproject.org deleted file mode 100644 index 7a8fdd97e0..0000000000 --- a/inventory/host_vars/qa09.qa.fedoraproject.org +++ /dev/null @@ -1,35 +0,0 @@ ---- -freezes: false -fas_client_groups: sysadmin-qa,sysadmin-main -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" -nrpe_procs_warn: 1400 -nrpe_procs_crit: 1600 -eth0_ip: 10.5.124.239 -gw: 10.5.124.254 - -# openQA tap worker hosts (like this one) do stuff with ifcfg that base -# doesn't understand. terrible, terrible stuff. seriously - it doesn't -# handle the openvswitch config well. so let's tell it to just configure -# the regular interfaces (which on this system is eth0 and eth1) for us, -# disabling all but the one we want to use (eth0), and leave everything -# else alone. -ansible_ifcfg_allowlist: ['eth0', 'eth1'] -ansible_ifcfg_disabled: ['eth1'] - -# this is a powerful machine, can handle more openQA workers -openqa_workers: 10 -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103'] -nagios_Can_Connect: false - -nagios_Check_Services: - nrpe: false - sshd: false - named: false - dhcpd: false - httpd: false - swap: false diff --git a/inventory/host_vars/qa14.qa.fedoraproject.org b/inventory/host_vars/qa14.qa.fedoraproject.org deleted file mode 100644 index 793b209904..0000000000 --- a/inventory/host_vars/qa14.qa.fedoraproject.org +++ /dev/null @@ -1,26 +0,0 @@ ---- -freezes: false -fas_client_groups: sysadmin-qa,sysadmin-main -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 -eth0_ip: 10.5.131.22 -gw: 10.5.131.254 - -# openQA tap worker hosts (like this one) do stuff with ifcfg that base -# doesn't understand. terrible, terrible stuff. seriously - it doesn't -# handle the openvswitch config well. so let's tell it to just configure -# the regular interfaces (which on this system is eth0 and eth1) for us, -# disabling all but the one we want to use (eth0), and leave everything -# else alone. -ansible_ifcfg_allowlist: ['eth0', 'eth1'] -ansible_ifcfg_disabled: ['eth1'] - -# this is a powerful machine, can handle more openQA workers -openqa_workers: 10 -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103'] diff --git a/inventory/host_vars/rabbitmq01.phx2.fedoraproject.org b/inventory/host_vars/rabbitmq01.phx2.fedoraproject.org deleted file mode 100644 index 8f19e45ebf..0000000000 --- a/inventory/host_vars/rabbitmq01.phx2.fedoraproject.org +++ /dev/null @@ -1,22 +0,0 @@ ---- -volgroup: /dev/vg_guests -eth0_ip: 10.5.126.74 -vmhost: virthost01.phx2.fedoraproject.org - -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/ - -datacenter: phx2 - -# Define resources for this group of hosts here. -lvm_size: 20000 -mem_size: 4096 -num_cpus: 2 - -# for systems that do not match the above - specify the same parameter in -# the host_vars/$hostname file - diff --git a/inventory/host_vars/rabbitmq02.phx2.fedoraproject.org b/inventory/host_vars/rabbitmq02.phx2.fedoraproject.org deleted file mode 100644 index 7a51a69392..0000000000 --- a/inventory/host_vars/rabbitmq02.phx2.fedoraproject.org +++ /dev/null @@ -1,22 +0,0 @@ ---- -volgroup: /dev/vg_guests -eth0_ip: 10.5.126.75 -vmhost: virthost12.phx2.fedoraproject.org - -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/ - -datacenter: phx2 - -# Define resources for this group of hosts here. -lvm_size: 20000 -mem_size: 4096 -num_cpus: 2 - -# for systems that do not match the above - specify the same parameter in -# the host_vars/$hostname file - diff --git a/inventory/host_vars/rabbitmq03.phx2.fedoraproject.org b/inventory/host_vars/rabbitmq03.phx2.fedoraproject.org deleted file mode 100644 index 4287eedf53..0000000000 --- a/inventory/host_vars/rabbitmq03.phx2.fedoraproject.org +++ /dev/null @@ -1,22 +0,0 @@ ---- -volgroup: /dev/vg_guests -eth0_ip: 10.5.126.76 -vmhost: virthost14.phx2.fedoraproject.org - -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/ - -datacenter: phx2 - -# Define resources for this group of hosts here. -lvm_size: 20000 -mem_size: 4096 -num_cpus: 2 - -# for systems that do not match the above - specify the same parameter in -# the host_vars/$hostname file - diff --git a/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org b/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org deleted file mode 100644 index 91db7d3227..0000000000 --- a/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org +++ /dev/null @@ -1,48 +0,0 @@ -vmhost: bvirthost15.phx2.fedoraproject.org -eth0_ip: 10.5.125.69 -eth1_ip: 10.5.127.54 -volgroup: /dev/vg_guests -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-32 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/32/Server/x86_64/os/ - -koji_hub_nfs: "fedora_koji" - -kojipkgs_url: kojipkgs.fedoraproject.org -kojihub_url: koji.fedoraproject.org/kojihub -kojihub_scheme: https - -# rawhide is never frozen, the compose box should not be so we can make needed changes -freezes: false - -fedmsg_certs: -- service: releng - owner: root - group: sysadmin-releng - can_send: - - pungi.compose.phase.start - - pungi.compose.phase.stop - - pungi.compose.status.change - - pungi.compose.createiso.targets - - pungi.compose.createiso.imagefail - - pungi.compose.createiso.imagedone - - pungi.compose.ostree - - compose.rawhide.complete - - compose.rawhide.mash.complete - - compose.rawhide.mash.start - - compose.rawhide.image.complete - - compose.rawhide.image.start - - compose.rawhide.pungify.complete - - compose.rawhide.pungify.start - - compose.rawhide.rsync.complete - - compose.rawhide.rsync.start - - compose.rawhide.start - - compose.bikeshed.complete - - compose.bikeshed.mash.complete - - compose.bikeshed.mash.start - - compose.bikeshed.image.complete - - compose.bikeshed.image.start - - compose.bikeshed.pungify.complete - - compose.bikeshed.pungify.start - - compose.bikeshed.rsync.complete - - compose.bikeshed.rsync.start - - compose.bikeshed.start diff --git a/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org b/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org deleted file mode 100644 index b50821204c..0000000000 --- a/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org +++ /dev/null @@ -1,33 +0,0 @@ ---- -############################################################ -# networking -############################################################ - -nm: 255.255.255.0 -gw: 10.5.124.254 -dns: 10.5.126.21 -eth0_ip: 10.5.124.147 -eth0_nm: 255.255.255.128 - -############################################################ -# install -############################################################ - -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-29 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/29/Server/x86_64/os/ - -volgroup: /dev/vg_guests -vmhost: virthost-comm04.qa.fedoraproject.org -datacenter: phx2 - -############################################################ -# virtual machine -############################################################ - -fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran -lvm_size: 50000 -mem_size: 8192 -num_cpus: 4 - -nrpe_procs_warn: 250 -nrpe_procs_crit: 300 diff --git a/inventory/host_vars/resultsdb01.qa.fedoraproject.org b/inventory/host_vars/resultsdb01.qa.fedoraproject.org deleted file mode 100644 index cce2d1a397..0000000000 --- a/inventory/host_vars/resultsdb01.qa.fedoraproject.org +++ /dev/null @@ -1,31 +0,0 @@ ---- -############################################################ -# networking -############################################################ - -nm: 255.255.255.0 -gw: 10.5.124.254 -dns: 10.5.126.21 -eth0_ip: 10.5.124.207 -eth0_nm: 255.255.255.128 - -############################################################ -# install -############################################################ - -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-31 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/31/Server/x86_64/os/ - -volgroup: /dev/VirtGuests -datacenter: phx2 -vmhost: virthost-comm03.qa.fedoraproject.org - -############################################################ -# virtual machine -############################################################ - -fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran -lvm_size: 50000 -mem_size: 8192 -num_cpus: 4 -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" diff --git a/inventory/host_vars/retrace01.qa.fedoraproject.org b/inventory/host_vars/retrace01.qa.fedoraproject.org deleted file mode 100644 index 2356ea8d01..0000000000 --- a/inventory/host_vars/retrace01.qa.fedoraproject.org +++ /dev/null @@ -1,179 +0,0 @@ ---- -faf_server_name: retrace.fedoraproject.org/faf -rs_use_faf_packages: true - -# we do not have enough storage on stg -rs_internal_fedora_vers: [30, 31, 32, rawhide] -rs_internal_fedora_vers_removed: [27, 28, 29] -rs_internal_arch_list: [source, x86_64, i386] - -nagios_Check_Services: - nrpe: true - sshd: true - named: false - dhcpd: false - httpd: false - swap: false - -# List of supported operating systems -faf_opsys_list: - - fedora - - centos - -# Clean-up packages of following EOLed operating systems -eol_opsys: - - { opsys: "Fedora", release: "27"} - - { opsys: "Fedora", release: "28"} - - { opsys: "Fedora", release: "29"} - -# GDPR SAR variables -sar_script: '/usr/bin/faf sar' -sar_script_user: faf -sar_output_file: faf.json - -faf_repos: - - { name: 'fedora-30-updates-testing-source', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/30/Everything/SRPMS/'], - arch: 'src', - opsys: 'Fedora 30' - } - - { name: 'fedora-30-updates-source', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/30/Everything/SRPMS/'], - arch: 'src', - opsys: 'Fedora 30' - } - - { name: 'fedora-30-i386-debug', - url: ['http://dl01.fedoraproject.org/pub/fedora-secondary/releases/30/Everything/i386/debug/tree/', 'http://dl01.fedoraproject.org/pub/fedora-secondary/development/30/Everything/i386/debug/tree/'], - arch: 'i386', - opsys: 'Fedora 30', - } - - { name: 'fedora-30-i386-testing-debug', - url: ['http://dl01.fedoraproject.org/pub/fedora-secondary/updates/testing/30/Everything/i386/debug/'], - arch: 'i386', - opsys: 'Fedora 30', - } - - { name: 'fedora-30-i386-testing', - url: ['http://dl01.fedoraproject.org/pub/fedora-secondary/updates/testing/30/Everything/i386/'], - arch: 'i386', - opsys: 'Fedora 30', - } - - { name: 'fedora-30-i386-updates-debug', - url: ['http://dl01.fedoraproject.org/pub/fedora-secondary/updates/30/Everything/i386/debug/'], - arch: 'i386', - opsys: 'Fedora 30', - } - - { name: 'fedora-30-i386-updates', - url: ['http://dl01.fedoraproject.org/pub/fedora-secondary/updates/30/Everything/i386/'], - arch: 'i386', - opsys: 'Fedora 30', - } - - { name: 'fedora-30-i386', - url: ['http://dl01.fedoraproject.org/pub/fedora-secondary/releases/30/Everything/i386/os/', 'http://dl01.fedoraproject.org/pub/fedora-secondary/development/30/Everything/i386/os/'], - arch: 'i386', - opsys: 'Fedora 30', - } - - { name: 'fedora-30-source', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/30/Everything/source/tree/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/30/Everything/source/tree/'], - arch: 'src', - opsys: 'Fedora 30', - } - - { name: 'fedora-30-x86_64', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/30/Everything/x86_64/os/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/30/Everything/x86_64/os/'], - arch: 'x86_64', - opsys: 'Fedora 30', - } - - { name: 'fedora-30-x86_64-debug', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/30/Everything/x86_64/debug/tree/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/30/Everything/x86_64/debug/tree/'], - arch: 'x86_64', - opsys: 'Fedora 30', - } - - { name: 'fedora-30-x86_64-testing-debug', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/30/Everything/x86_64/debug/'], - arch: 'x86_64', - opsys: 'Fedora 30', - } - - { name: 'fedora-30-x86_64-testing', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/30/Everything/x86_64/'], - arch: 'x86_64', - opsys: 'Fedora 30', - } - - { name: 'fedora-30-x86_64-updates-debug', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/30/Everything/x86_64/debug/'], - arch: 'x86_64', - opsys: 'Fedora 30', - } - - { name: 'fedora-30-x86_64-updates', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/30/Everything/x86_64/'], - arch: 'x86_64', - opsys: 'Fedora 30', - } - - { name: 'fedora-31-source', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/31/Everything/source/tree/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/31/Everything/source/tree/'], - arch: 'src', - opsys: 'Fedora 31', - } - - { name: 'fedora-31-x86_64', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/31/Everything/x86_64/os/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/31/Everything/x86_64/os/'], - arch: 'x86_64', - opsys: 'Fedora 31', - } - - { name: 'fedora-31-x86_64-debug', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/31/Everything/x86_64/debug/tree/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/31/Everything/x86_64/debug/tree/'], - arch: 'x86_64', - opsys: 'Fedora 31', - } - - { name: 'fedora-31-x86_64-testing-debug', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/31/Everything/x86_64/debug/'], - arch: 'x86_64', - opsys: 'Fedora 31', - } - - { name: 'fedora-31-x86_64-testing', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/31/Everything/x86_64/'], - arch: 'x86_64', - opsys: 'Fedora 31', - } - - { name: 'fedora-31-x86_64-updates-debug', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/31/Everything/x86_64/debug/'], - arch: 'x86_64', - opsys: 'Fedora 31', - } - - { name: 'fedora-31-x86_64-updates', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/31/Everything/x86_64/'], - arch: 'x86_64', - opsys: 'Fedora 31', - } - - { name: 'fedora-32-source', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/32/Everything/source/tree/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/32/Everything/source/tree/'], - arch: 'src', - opsys: 'Fedora 32', - } - - { name: 'fedora-32-x86_64', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/32/Everything/x86_64/os/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/32/Everything/x86_64/os/'], - arch: 'x86_64', - opsys: 'Fedora 32', - } - - { name: 'fedora-32-x86_64-debug', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/32/Everything/x86_64/debug/tree/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/32/Everything/x86_64/debug/tree/'], - arch: 'x86_64', - opsys: 'Fedora 32', - } - - { name: 'fedora-32-x86_64-testing-debug', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/32/Everything/x86_64/debug/'], - arch: 'x86_64', - opsys: 'Fedora 32', - } - - { name: 'fedora-32-x86_64-testing', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/32/Everything/x86_64/'], - arch: 'x86_64', - opsys: 'Fedora 32', - } - - { name: 'fedora-32-x86_64-updates-debug', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/32/Everything/x86_64/debug/'], - arch: 'x86_64', - opsys: 'Fedora 32', - } - - { name: 'fedora-32-x86_64-updates', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/32/Everything/x86_64/'], - arch: 'x86_64', - opsys: 'Fedora 32', - } diff --git a/inventory/host_vars/retrace02.qa.fedoraproject.org b/inventory/host_vars/retrace02.qa.fedoraproject.org deleted file mode 100644 index c20bf0226a..0000000000 --- a/inventory/host_vars/retrace02.qa.fedoraproject.org +++ /dev/null @@ -1,18 +0,0 @@ ---- -faf_server_name: retrace.fedoraproject.org/faf -rs_use_faf_packages: true - -# we do not have enough storage on stg -rs_internal_fedora_vers: [rawhide] -#rs_internal_fedora_vers_removed: [24, 25, 26, 27] -rs_internal_arch_list: [source, x86_64, i386] - -nagios_Check_Services: - nrpe: true - sshd: true - named: false - dhcpd: false - httpd: false - swap: false - -faf_repos: [] diff --git a/inventory/host_vars/secondary01.phx2.fedoraproject.org b/inventory/host_vars/secondary01.phx2.fedoraproject.org deleted file mode 100644 index 14f98eb7cb..0000000000 --- a/inventory/host_vars/secondary01.phx2.fedoraproject.org +++ /dev/null @@ -1,23 +0,0 @@ ---- -lvm_size: 40000 -mem_size: 10240 -num_cpus: 4 - -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.27 -eth1_ip: 10.5.127.66 - -vmhost: virthost02.phx2.fedoraproject.org -datacenter: phx2 - -# We define this here to override the global one because we need eth1 -virt_install_command: "{{ virt_install_command_two_nic }}" - -public_hostname: secondary01.fedoraproject.org diff --git a/inventory/host_vars/sign-bridge01.phx2.fedoraproject.org b/inventory/host_vars/sign-bridge01.phx2.fedoraproject.org deleted file mode 100644 index d005e486c3..0000000000 --- a/inventory/host_vars/sign-bridge01.phx2.fedoraproject.org +++ /dev/null @@ -1,12 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.125.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 -vmhost: bvirthost12.phx2.fedoraproject.org -datacenter: phx2 - -eth0_ip: 10.5.125.71 diff --git a/inventory/host_vars/sign-vault05.phx2.fedoraproject.org b/inventory/host_vars/sign-vault05.phx2.fedoraproject.org deleted file mode 100644 index 640cf9e319..0000000000 --- a/inventory/host_vars/sign-vault05.phx2.fedoraproject.org +++ /dev/null @@ -1,10 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.83 - -install_noc: noc01.phx2.fedoraproject.org -install_mac: D0:94:66:45:87:C1 -# Inside this, expect /vmlinuz and /initrd.img -install_binpath: /uefi/x86_64/f28 -install_ks: http://10.5.126.23/repo/rhel/ks/buildhw-f28 -install_repo: http://10.5.126.23/pub/fedora/linux/releases/28/Server/x86_64/os/ diff --git a/inventory/host_vars/sign-vault06.phx2.fedoraproject.org b/inventory/host_vars/sign-vault06.phx2.fedoraproject.org deleted file mode 100644 index b2a9e8d90b..0000000000 --- a/inventory/host_vars/sign-vault06.phx2.fedoraproject.org +++ /dev/null @@ -1,10 +0,0 @@ ---- -gw: 10.5.125.254 -eth0_ip: 10.5.125.84 - -install_noc: noc01.phx2.fedoraproject.org -install_mac: D0:94:66:45:A1:62 -# Inside this, expect /vmlinuz and /initrd.img -install_binpath: /uefi/x86_64/f28 -install_ks: http://10.5.126.23/repo/rhel/ks/buildhw-f28 -install_repo: http://10.5.126.23/pub/fedora/linux/releases/28/Server/x86_64/os/ diff --git a/inventory/host_vars/sundries01.phx2.fedoraproject.org b/inventory/host_vars/sundries01.phx2.fedoraproject.org deleted file mode 100644 index a295832865..0000000000 --- a/inventory/host_vars/sundries01.phx2.fedoraproject.org +++ /dev/null @@ -1,14 +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.38 -vmhost: virthost12.phx2.fedoraproject.org -datacenter: phx2 - -# This overrides a group var and lets the playbook know that we should -# install special cron jobs here. -master_sundries_node: True diff --git a/inventory/host_vars/sundries02.phx2.fedoraproject.org b/inventory/host_vars/sundries02.phx2.fedoraproject.org deleted file mode 100644 index 5c4eb707a9..0000000000 --- a/inventory/host_vars/sundries02.phx2.fedoraproject.org +++ /dev/null @@ -1,10 +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.40 -vmhost: virthost14.phx2.fedoraproject.org -datacenter: phx2 diff --git a/inventory/host_vars/tang01.phx2.fedoraproject.org b/inventory/host_vars/tang01.phx2.fedoraproject.org deleted file mode 100644 index 11a379d9c0..0000000000 --- a/inventory/host_vars/tang01.phx2.fedoraproject.org +++ /dev/null @@ -1,21 +0,0 @@ ---- -volgroup: /dev/vg_guests -eth0_ip: 10.5.126.3 -vmhost: virthost12.phx2.fedoraproject.org - -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-fedora-30 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/30/Server/x86_64/os/ - -host_backup_targets: ['/var/db/tang'] - -datacenter: phx2 - -# Define resources for this group of hosts here. -lvm_size: 20000 -mem_size: 4096 -num_cpus: 2 - diff --git a/inventory/host_vars/tang02.phx2.fedoraproject.org b/inventory/host_vars/tang02.phx2.fedoraproject.org deleted file mode 100644 index b2676b0ae6..0000000000 --- a/inventory/host_vars/tang02.phx2.fedoraproject.org +++ /dev/null @@ -1,21 +0,0 @@ ---- -volgroup: /dev/vg_guests -eth0_ip: 10.5.126.4 -vmhost: virthost14.phx2.fedoraproject.org - -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-fedora-30 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/30/Server/x86_64/os/ - -host_backup_targets: ['/var/db/tang'] - -datacenter: phx2 - -# Define resources for this group of hosts here. -lvm_size: 20000 -mem_size: 4096 -num_cpus: 2 - diff --git a/inventory/host_vars/value01.phx2.fedoraproject.org b/inventory/host_vars/value01.phx2.fedoraproject.org deleted file mode 100644 index 6864a7fc83..0000000000 --- a/inventory/host_vars/value01.phx2.fedoraproject.org +++ /dev/null @@ -1,18 +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.49 -vmhost: virthost14.phx2.fedoraproject.org -datacenter: phx2 -host_backup_targets: ['/srv', '/var/lib/zodbot'] - - -# GDPR SAR variables - meetbot -sar_script: /usr/local/bin/meetbot_sar.py -sar_script_user: root -sar_output_file: meetbot.json - diff --git a/inventory/host_vars/virthost-comm02.qa.fedoraproject.org b/inventory/host_vars/virthost-comm02.qa.fedoraproject.org deleted file mode 100644 index 400f2863b6..0000000000 --- a/inventory/host_vars/virthost-comm02.qa.fedoraproject.org +++ /dev/null @@ -1,11 +0,0 @@ ---- -# This virthost only has non release critical instances, so it doesn't freeze -freezes: false -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -nm: 255.255.255.128 -gw: 10.5.124.254 -dns: 10.5.126.21 -br0_ip: 10.5.124.137 -br0_nm: 255.255.255.128 diff --git a/inventory/host_vars/virthost-comm03.qa.fedoraproject.org b/inventory/host_vars/virthost-comm03.qa.fedoraproject.org deleted file mode 100644 index 9d9686e8c0..0000000000 --- a/inventory/host_vars/virthost-comm03.qa.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ ---- -nested: true diff --git a/inventory/host_vars/virthost-comm04.qa.fedoraproject.org b/inventory/host_vars/virthost-comm04.qa.fedoraproject.org deleted file mode 100644 index 0d48fc83ec..0000000000 --- a/inventory/host_vars/virthost-comm04.qa.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -# This virthost only has non release critical instances, so it doesn't freeze -freezes: false -nested: true diff --git a/inventory/host_vars/virthost04.phx2.fedoraproject.org b/inventory/host_vars/virthost04.phx2.fedoraproject.org deleted file mode 100644 index 4820f386cb..0000000000 --- a/inventory/host_vars/virthost04.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.126.254 -br0_ip: 10.5.126.144 -br0_nm: 255.255.255.0 -br1_ip: 10.5.127.203 -br1_nm: 255.255.255.0 - -install_noc: noc01.phx2.fedoraproject.org -install_mac: E4:43:4B:24:19:96 -# 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-10disk -install_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ diff --git a/inventory/host_vars/virthost05.phx2.fedoraproject.org b/inventory/host_vars/virthost05.phx2.fedoraproject.org deleted file mode 100644 index c3f0ee76c7..0000000000 --- a/inventory/host_vars/virthost05.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.126.254 -br0_ip: 10.5.126.145 -br0_nm: 255.255.255.0 -br1_ip: 10.5.127.229 -br1_nm: 255.255.255.0 - -install_noc: noc01.phx2.fedoraproject.org -install_mac: E4:43:4B:22:CE:EA -# 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-10disk -install_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ diff --git a/inventory/host_vars/virthost06.phx2.fedoraproject.org b/inventory/host_vars/virthost06.phx2.fedoraproject.org deleted file mode 100644 index 916924f447..0000000000 --- a/inventory/host_vars/virthost06.phx2.fedoraproject.org +++ /dev/null @@ -1,9 +0,0 @@ ---- -freezes: true -nested: true -dns: 10.5.126.21 -gw: 10.5.126.254 -br0_ip: 10.5.126.146 -br0_nm: 255.255.255.0 -br1_ip: 10.5.127.196 -br1_nm: 255.255.255.0 diff --git a/inventory/host_vars/virthost10.phx2.fedoraproject.org b/inventory/host_vars/virthost10.phx2.fedoraproject.org deleted file mode 100644 index 92cc5c0e3a..0000000000 --- a/inventory/host_vars/virthost10.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/wiki01.phx2.fedoraproject.org b/inventory/host_vars/wiki01.phx2.fedoraproject.org deleted file mode 100644 index 6555e8e7af..0000000000 --- a/inventory/host_vars/wiki01.phx2.fedoraproject.org +++ /dev/null @@ -1,11 +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-fedora-30 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/30/Server/x86_64/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.126.63 -eth1_ip: 10.5.127.43 -vmhost: virthost12.phx2.fedoraproject.org -datacenter: phx2 diff --git a/inventory/host_vars/wiki02.phx2.fedoraproject.org b/inventory/host_vars/wiki02.phx2.fedoraproject.org deleted file mode 100644 index bc582c7fc0..0000000000 --- a/inventory/host_vars/wiki02.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-fedora-30 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/30/Server/x86_64/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.126.73 -eth1_ip: 10.5.127.44 -vmhost: virthost14.phx2.fedoraproject.org -datacenter: phx2 - -# GDPR SAR variables -sar_script: "echo \"https://fedoraproject.org/w/index.php?title=Special:Contributions/${SAR_USERNAME}&limit=5000000\"\n\"https://fedoraproject.org/w/index.php?title=Special:Logs/${SAR_USERNAME}&limit=5000000\"" -sar_script_user: nobody -sar_output_file: wiki.link - diff --git a/inventory/host_vars/zanata2fedmsg01.phx2.fedoraproject.org b/inventory/host_vars/zanata2fedmsg01.phx2.fedoraproject.org deleted file mode 100644 index e9d9b516d3..0000000000 --- a/inventory/host_vars/zanata2fedmsg01.phx2.fedoraproject.org +++ /dev/null @@ -1,21 +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 -vmhost: virthost01.phx2.fedoraproject.org -datacenter: phx2 - -tcp_ports: ['80'] - -eth0_ip: 10.5.126.196 -csi_relationship: | - zanata2fedmsg is a tiny webapp that receives a webhook POST from - fedora.zanata.org and then republishes that data to our fedmsg bus. - - It also has a cronjob that periodically wakes up, logs into - fedora.zanata.org and adds our webhook URL to all projects where it is - absent. diff --git a/inventory/inventory b/inventory/inventory index 0dbebac4d1..c5181f7ad9 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -55,10 +55,8 @@ badges-web01.iad2.fedoraproject.org # basset01.stg.iad2.fedoraproject.org [bastion] -bastion01.phx2.fedoraproject.org -bastion02.phx2.fedoraproject.org -bastion13.fedoraproject.org bastion01.iad2.fedoraproject.org +bastion13.fedoraproject.org [bastion_stg] # bastion01.stg.iad2.fedoraproject.org @@ -272,14 +270,10 @@ kojipkgs01.iad2.fedoraproject.org kojipkgs02.iad2.fedoraproject.org [infracore] -batcave01.phx2.fedoraproject.org batcave01.iad2.fedoraproject.org -log01.phx2.fedoraproject.org log01.iad2.fedoraproject.org -noc01.phx2.fedoraproject.org noc01.iad2.fedoraproject.org noc02.fedoraproject.org -data-analysis01.phx2.fedoraproject.org #cloud-noc01.fedorainfracloud.org [logging] @@ -400,8 +394,6 @@ secondary01.iad2.fedoraproject.org ns01.iad2.fedoraproject.org ns02.iad2.fedoraproject.org ns02.fedoraproject.org -ns03.phx2.fedoraproject.org -ns04.phx2.fedoraproject.org ns05.fedoraproject.org ns13.rdu2.fedoraproject.org @@ -662,7 +654,6 @@ batcave01.iad2.fedoraproject.org bastion01.iad2.fedoraproject.org bastion02.iad2.fedoraproject.org certgetter01.iad2.fedoraproject.org -# download01.phx2.fedoraproject.org log01.iad2.fedoraproject.org ns01.iad2.fedoraproject.org ns02.iad2.fedoraproject.org @@ -698,18 +689,6 @@ value01.iad2.fedoraproject.org # virthost03.stg.iad2.fedoraproject.org # virthost04.stg.iad2.fedoraproject.org # virthost05.stg.iad2.fedoraproject.org -virthost01.phx2.fedoraproject.org -virthost02.phx2.fedoraproject.org -virthost04.phx2.fedoraproject.org -virthost06.phx2.fedoraproject.org -virthost12.phx2.fedoraproject.org -virthost14.phx2.fedoraproject.org -virthost15.phx2.fedoraproject.org -virthost17.phx2.fedoraproject.org -virthost18.phx2.fedoraproject.org -virthost19.phx2.fedoraproject.org -virthost21.phx2.fedoraproject.org -virthost22.phx2.fedoraproject.org qa09.qa.fedoraproject.org vmhost-x86-01.iad2.fedoraproject.org vmhost-x86-02.iad2.fedoraproject.org @@ -1116,9 +1095,6 @@ badges-backend01.iad2.fedoraproject.org bodhi-backend01.iad2.fedoraproject.org mailman01.iad2.fedoraproject.org people02.fedoraproject.org -#db-datanommer02.phx2.fedoraproject.org -#nuancier01.phx2.fedoraproject.org -#fedocal02.phx2.fedoraproject.org pagure01.fedoraproject.org pkgs01.iad2.fedoraproject.org notifs-web01.iad2.fedoraproject.org @@ -1371,25 +1347,3 @@ wiki01.iad2.fedoraproject.org [iad2:vars] ansible_group_priority=10 datacenter=iad2 - -[phx2] -bastion01.phx2.fedoraproject.org -bastion02.phx2.fedoraproject.org -batcave01.phx2.fedoraproject.org -noc01.phx2.fedoraproject.org -ns03.phx2.fedoraproject.org -ns04.phx2.fedoraproject.org -tang01.phx2.fedoraproject.org -tang02.phx2.fedoraproject.org -virthost01.phx2.fedoraproject.org -virthost02.phx2.fedoraproject.org -virthost04.phx2.fedoraproject.org -virthost06.phx2.fedoraproject.org -virthost12.phx2.fedoraproject.org -virthost14.phx2.fedoraproject.org -virthost15.phx2.fedoraproject.org -virthost17.phx2.fedoraproject.org -virthost18.phx2.fedoraproject.org -virthost19.phx2.fedoraproject.org -virthost21.phx2.fedoraproject.org -virthost22.phx2.fedoraproject.org diff --git a/inventory/zzz-inventory.config b/inventory/zzz-inventory.config index 35f5b2a188..9119656363 100644 --- a/inventory/zzz-inventory.config +++ b/inventory/zzz-inventory.config @@ -2,7 +2,7 @@ plugin: constructed strict: False compose: groups: - virthost02_guests: vmhost is defined and vmhost == 'virthost01.phx2.fedoraproject.org' + vmhost-x86-02: vmhost is defined and vmhost == 'vmhost-x86-02.iad2.fedoraproject.org' keyed_groups: - prefix: distro key: ansible_distribution diff --git a/master.yml b/master.yml index 1f8cbe872b..fe13b6e6b8 100644 --- a/master.yml +++ b/master.yml @@ -112,6 +112,4 @@ # - import_playbook: /srv/web/infra/ansible/playbooks/hosts/cloud-noc01.fedorainfracloud.org.yml -- import_playbook: /srv/web/infra/ansible/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml -- import_playbook: /srv/web/infra/ansible/playbooks/hosts/grobisplitter01.phx2.fedoraproject.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/iddev.fedorainfracloud.org.yml diff --git a/playbooks/destroy_virt_inst.yml b/playbooks/destroy_virt_inst.yml index 3dd25baf6f..008f67ccbf 100644 --- a/playbooks/destroy_virt_inst.yml +++ b/playbooks/destroy_virt_inst.yml @@ -26,7 +26,7 @@ - name: schedule 30m host downtime in nagios nagios: action=downtime minutes=60 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true - name: pause for 30s before doing it diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml index edc988cb96..6577dfcdc1 100644 --- a/playbooks/groups/backup-server.yml +++ b/playbooks/groups/backup-server.yml @@ -26,7 +26,7 @@ nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3", nfs_src_dir: 'fedora_backups' } - openvpn/client - - { role: grokmirror_mirror, when: datacenter == "phx2"} + - grokmirror_mirror pre_tasks: - import_tasks: "{{ tasks_path }}/yumrepos.yml" diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml index 6c86ce7f3e..53c31f8fdc 100644 --- a/playbooks/groups/bodhi-backend.yml +++ b/playbooks/groups/bodhi-backend.yml @@ -41,22 +41,12 @@ - role: nfs/client mnt_dir: '/mnt/koji/ostree' nfs_src_dir: 'fedora_ostree_content/ostree' - when: env != 'staging' and datacenter == 'phx2' + when: env != 'staging' - role: nfs/client mnt_dir: '/mnt/koji/compose/ostree' nfs_src_dir: 'fedora_ostree_content/compose/ostree' - when: env != 'staging' and datacenter == 'phx2' - - - role: nfs/client - mnt_dir: '/mnt/koji/ostree' - nfs_src_dir: 'fedora_ostree_content/ostree' - when: env != 'staging' and datacenter == 'iad2' - - - role: nfs/client - mnt_dir: '/mnt/koji/compose/ostree' - nfs_src_dir: 'fedora_ostree_content/compose/ostree' - when: env != 'staging' and datacenter == 'iad2' + when: env != 'staging' - role: nfs/client mnt_dir: '/mnt/koji/ostree' diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml index 2966c2b474..daed9b846a 100644 --- a/playbooks/groups/download.yml +++ b/playbooks/groups/download.yml @@ -36,8 +36,6 @@ - apache - download - rsyncd - - { role: nfs/client, when: datacenter == "phx2", mnt_dir: '/srv/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } - - { role: nfs/client, when: datacenter == "phx2", mnt_dir: '/mnt/koji/compose', nfs_src_dir: 'fedora_koji/koji/compose' } # needed for internal sync - { role: nfs/client, when: datacenter == "iad2" or datacenter == "rdu", mnt_dir: '/srv/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } - { role: nfs/client, when: datacenter == "iad2", mnt_dir: '/mnt/koji/compose', nfs_src_dir: 'fedora_koji/koji/compose' } # needed for internal sync - sudo diff --git a/playbooks/groups/kojipkgs.yml b/playbooks/groups/kojipkgs.yml index b8040cb9f2..a09935af28 100644 --- a/playbooks/groups/kojipkgs.yml +++ b/playbooks/groups/kojipkgs.yml @@ -49,16 +49,6 @@ - role: nfs/client mnt_dir: '/pub' nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' - - role: nfs/client - mnt_dir: '/mnt/koji/ostree' - nfs_src_dir: 'fedora_ostree_content/ostree' - mount_stg: true - when: datacenter == 'phx2' - - role: nfs/client - mnt_dir: '/mnt/koji/compose/ostree' - mount_stg: true - nfs_src_dir: 'fedora_ostree_content/compose/ostree' - when: datacenter == 'phx2' - role: nfs/client mnt_dir: '/mnt/koji/ostree' nfs_src_dir: 'fedora_ostree_content/ostree' diff --git a/playbooks/groups/logserver.yml b/playbooks/groups/logserver.yml index 9b5476fd5d..a4dae0cef5 100644 --- a/playbooks/groups/logserver.yml +++ b/playbooks/groups/logserver.yml @@ -51,7 +51,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: Cloud Image stats - hosts: log01.phx2.fedoraproject.org + hosts: log01.iad2.fedoraproject.org user: root gather_facts: False diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index 5f3b2fac26..07e1e163df 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -123,7 +123,7 @@ - httpd - mailman3 - postfix - when: inventory_hostname.startswith('mailman01.phx2') + when: inventory_hostname.startswith('mailman01.iad2') handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/mbs.yml b/playbooks/groups/mbs.yml index 39ec26b508..6f5c279ff1 100644 --- a/playbooks/groups/mbs.yml +++ b/playbooks/groups/mbs.yml @@ -41,7 +41,7 @@ - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - - { role: openvpn/client, when: datacenter == 'phx2' } + - { role: openvpn/client, when: datacenter == 'iad2' } handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml index 3662ae12bd..a9b805dc83 100644 --- a/playbooks/groups/noc.yml +++ b/playbooks/groups/noc.yml @@ -21,7 +21,7 @@ - hosts - fas_client - collectd/base - - { role: rsyncd, when: datacenter == 'phx2' or datacenter == 'iad2' } + - { role: rsyncd, when: datacenter == 'iad2' } - sudo - { role: openvpn/client, when: env != "staging" } - mod_wsgi @@ -30,13 +30,13 @@ owner_group: apache service: HTTP host: "nagios{{env_suffix}}.fedoraproject.org" - when: datacenter == 'phx2' or datacenter == 'iad2' + when: datacenter == 'iad2' - role: keytab/service owner_user: apache owner_group: apache service: HTTP host: "nagios-external{{env_suffix}}.fedoraproject.org" - when: datacenter != 'phx2' + when: datacenter != 'iad2' - { role: letsencrypt, site_name: 'nagios-external.fedoraproject.org', when: inventory_hostname.startswith('noc02') } tasks: @@ -60,8 +60,8 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" roles: - - { role: dhcp_server, when: datacenter == 'phx2' or datacenter == 'iad2' } - - { role: tftp_server, when: datacenter == 'phx2' or datacenter == 'iad2' } + - { role: dhcp_server, when: datacenter == 'iad2' } + - { role: tftp_server, when: datacenter == 'iad2' } - { role: nagios_server } - { role: fedmsg/base, when: deployment_type == "prod" and datacenter != 'iad2'} - { role: rabbit/user, when: deployment_type == "stg" or datacenter == 'iad2'} diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml index b33c287445..5f2308b668 100644 --- a/playbooks/groups/notifs-backend.yml +++ b/playbooks/groups/notifs-backend.yml @@ -51,7 +51,7 @@ pre_tasks: - name: tell nagios to shush w.r.t. the backend since it usually complains nagios: action=downtime minutes=25 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true tags: - fedmsgdconfig diff --git a/playbooks/groups/odcs.yml b/playbooks/groups/odcs.yml index f1ef9edda1..be6bed0608 100644 --- a/playbooks/groups/odcs.yml +++ b/playbooks/groups/odcs.yml @@ -146,7 +146,7 @@ # keytab for odcs releng backend - role: keytab/service service: odcs - host: "odcs-backend-releng01.phx2.fedoraproject.org" + host: "odcs-backend-releng01.iad2.fedoraproject.org" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/openqa.yml b/playbooks/groups/openqa.yml index 6c87aa14e3..a8f8eadf7d 100644 --- a/playbooks/groups/openqa.yml +++ b/playbooks/groups/openqa.yml @@ -22,7 +22,7 @@ - { role: collectd/base, tags: ['collectd_base'] } - { role: sudo, tags: ['sudo'] } - { role: openvpn/client, - when: deployment_type == "prod" and datacenter == 'phx2', tags: ['openvpn_client'] } + when: deployment_type == "prod" and datacenter == 'iad2', tags: ['openvpn_client'] } - apache tasks: diff --git a/playbooks/groups/os-cluster.yml b/playbooks/groups/os-cluster.yml index 75d2ef1c90..dc4d67a7de 100644 --- a/playbooks/groups/os-cluster.yml +++ b/playbooks/groups/os-cluster.yml @@ -148,7 +148,7 @@ openshift_deployment_type: "openshift-enterprise", openshift_cluster_url: "{{ os_url}}", openshift_app_subdomain: "{{ os_app_url }}", - openshift_internal_cluster_url: "os-masters{{ env_suffix }}.phx2.fedoraproject.org", + openshift_internal_cluster_url: "os-masters{{ env_suffix }}.iad2.fedoraproject.org", openshift_api_port: 443, openshift_console_port: 443, openshift_shared_infra: true, @@ -157,35 +157,6 @@ when: env == 'staging', tags: ['openshift-cluster','ansible-ansible-openshift-ansible'] } - - { - role: ansible-ansible-openshift-ansible, - cluster_inventory_filename: "cluster-inventory", - openshift_release: "v3.11", - openshift_ansible_path: "/root/openshift-ansible", - openshift_ansible_pre_playbook: "playbooks/prerequisites.yml", - openshift_ansible_playbook: "playbooks/deploy_cluster.yml", - openshift_ansible_version: "openshift-ansible-3.11.145-1", - openshift_ansible_ssh_user: root, - openshift_ansible_install_examples: true, - openshift_ansible_containerized_deploy: false, - openshift_cluster_masters_group: "os_masters", - openshift_cluster_nodes_group: "os_nodes", - openshift_cluster_infra_group: "os_nodes", - openshift_auth_profile: "fedoraidp", - openshift_master_ha: true, - openshift_debug_level: 1, - openshift_deployment_type: "openshift-enterprise", - openshift_cluster_url: "{{ os_url}}", - openshift_app_subdomain: "{{ os_app_url }}", - openshift_internal_cluster_url: "os-masters{{ env_suffix }}.phx2.fedoraproject.org", - openshift_api_port: 443, - openshift_console_port: 443, - openshift_shared_infra: true, - openshift_ansible_use_crio: true, - openshift_ansible_crio_only: false, - when: env != 'staging' and datacenter == 'phx2', - tags: ['openshift-cluster','ansible-ansible-openshift-ansible'] - } - { role: ansible-ansible-openshift-ansible, cluster_inventory_filename: "cluster-inventory", diff --git a/playbooks/groups/pdc.yml b/playbooks/groups/pdc.yml index 2ae8397fdc..ff549f3310 100644 --- a/playbooks/groups/pdc.yml +++ b/playbooks/groups/pdc.yml @@ -42,7 +42,7 @@ roles: - role: openvpn/client - when: env != "staging" and datacenter == 'phx2' + when: env != "staging" and datacenter == 'iad2' - mod_wsgi - { role: fedmsg/base, when: deployment_type == "prod" } diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml index 5b37f3ea4d..53a4f592a7 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -88,20 +88,20 @@ handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" -- name: setup fedmsg on pkgs - hosts: pkgs02.phx2.fedoraproject.org - user: root - gather_facts: True - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - roles: - - { role: collectd/fedmsg-service, process: fedmsg-hub } - - fedmsg/base - - fedmsg/hub - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml" +#- name: setup fedmsg on pkgs +# hosts: pkgs01.iad2.fedoraproject.org +# user: root +# gather_facts: True +# +# vars_files: +# - /srv/web/infra/ansible/vars/global.yml +# - "/srv/private/ansible/vars.yml" +# - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml +# +# roles: +# - { role: collectd/fedmsg-service, process: fedmsg-hub } +# - fedmsg/base +# - fedmsg/hub +# +# handlers: +# - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml index 6dda15c689..74057b13fa 100644 --- a/playbooks/groups/postgresql-server.yml +++ b/playbooks/groups/postgresql-server.yml @@ -2,12 +2,12 @@ # NOTE: should be used with --limit most of the time # NOTE: most of these vars_path come from group_vars/backup_server or from hostvars -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db-qa01.qa.fedoraproject.org:db-fas01.stg.iad2.fedoraproject.org:db01.phx2.fedoraproject.org:db01.stg.iad2.fedoraproject.org:db-qa02.qa.fedoraproject.org:db-koji01.stg.iad2.fedoraproject.org:db-qa03.qa.fedoraproject.org:db-fas01.iad2.fedoraproject.org:db01.iad2.fedoraproject.org:db-datanommer01.iad2.fedoraproject.org:db-koji01.iad2.fedoraproject.org:db-openqa01.iad2.fedoraproject.org" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db-qa01.qa.fedoraproject.org:db-fas01.stg.iad2.fedoraproject.org:db01.stg.iad2.fedoraproject.org:db-qa02.qa.fedoraproject.org:db-koji01.stg.iad2.fedoraproject.org:db-qa03.qa.fedoraproject.org:db-fas01.iad2.fedoraproject.org:db01.iad2.fedoraproject.org:db-datanommer01.iad2.fedoraproject.org:db-koji01.iad2.fedoraproject.org:db-openqa01.iad2.fedoraproject.org" # Once the instance exists, configure it. - name: configure postgresql server system - hosts: db-qa01.qa.fedoraproject.org:db-fas01.stg.iad2.fedoraproject.org:db01.phx2.fedoraproject.org:db01.stg.iad2.fedoraproject.org:db-qa02.qa.fedoraproject.org:db-koji01.stg.iad2.fedoraproject.org:db-qa03.qa.fedoraproject.org:db-fas01.iad2.fedoraproject.org:db01.iad2.fedoraproject.org:db-datanommer01.iad2.fedoraproject.org:db-koji01.iad2.fedoraproject.org:db-openqa01.iad2.fedoraproject.org + hosts: db-qa01.qa.fedoraproject.org:db-fas01.stg.iad2.fedoraproject.org:db01.stg.iad2.fedoraproject.org:db-qa02.qa.fedoraproject.org:db-koji01.stg.iad2.fedoraproject.org:db-qa03.qa.fedoraproject.org:db-fas01.iad2.fedoraproject.org:db01.iad2.fedoraproject.org:db-datanommer01.iad2.fedoraproject.org:db-koji01.iad2.fedoraproject.org:db-openqa01.iad2.fedoraproject.org user: root gather_facts: True diff --git a/playbooks/groups/rabbitmq.yml b/playbooks/groups/rabbitmq.yml index ea95d64835..40fda2a2d5 100644 --- a/playbooks/groups/rabbitmq.yml +++ b/playbooks/groups/rabbitmq.yml @@ -22,7 +22,7 @@ - collectd/base # RabbitMQ statistics are cluster-wide, only collect them on one member - role: collectd/rabbitmq - when: inventory_hostname.startswith('rabbitmq03.phx2') + when: inventory_hostname.startswith('rabbitmq03.iad2') - rsyncd - sudo - rabbitmq_cluster diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index 17d18c2448..cd40e1b25c 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -30,7 +30,7 @@ - sudo - role: keytab/service service: compose - host: "composer.stg.phx2.fedoraproject.org" + host: "composer.stg.iad2.fedoraproject.org" when: env == "staging" - role: keytab/service service: compose @@ -41,10 +41,10 @@ host: "koji{{env_suffix}}.fedoraproject.org" - role: loopabull/target loopabull_role: koji - when: inventory_hostname == 'composer.stg.phx2.fedoraproject.org' + when: inventory_hostname == 'composer.stg.iad2.fedoraproject.org' - role: loopabull/target loopabull_role: ociimage - when: inventory_hostname == 'composer.stg.phx2.fedoraproject.org' + when: inventory_hostname == 'composer.stg.iad2.fedoraproject.org' - role: nfs/client mnt_dir: '/mnt/fedora_koji' @@ -53,11 +53,11 @@ - role: nfs/client mnt_dir: '/mnt/koji/ostree' nfs_src_dir: 'fedora_ostree_content/ostree' - when: "'releng_stg' not in group_names and datacenter == 'phx2'" + when: "'releng_stg' not in group_names and datacenter == 'iad2'" - role: nfs/client mnt_dir: '/mnt/koji/compose/ostree' nfs_src_dir: 'fedora_ostree_content/compose/ostree' - when: "'releng_stg' not in group_names and datacenter == 'phx2'" + when: "'releng_stg' not in group_names and datacenter == 'iad2'" - role: nfs/client mnt_dir: '/mnt/koji/ostree' nfs_src_dir: 'fedora_ostree_content/ostree' diff --git a/playbooks/host_reboot.yml b/playbooks/host_reboot.yml index 554b284a02..119b6432b7 100644 --- a/playbooks/host_reboot.yml +++ b/playbooks/host_reboot.yml @@ -9,7 +9,7 @@ tasks: - name: tell nagios to shush nagios: action=downtime minutes=60 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true - name: reboot the host @@ -23,5 +23,5 @@ - name: tell nagios to unshush nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true diff --git a/playbooks/manual/autosign.yml b/playbooks/manual/autosign.yml index 26a0666b57..875d5398b4 100644 --- a/playbooks/manual/autosign.yml +++ b/playbooks/manual/autosign.yml @@ -32,12 +32,12 @@ - role: nfs/client mnt_dir: '/mnt/fedora_koji/koji/ostree' nfs_src_dir: 'fedora_ostree_content/ostree' - when: env != 'staging' and datacenter == 'phx2' + when: env != 'staging' and datacenter == 'iad2' - role: nfs/client mnt_dir: '/mnt/fedora_koji/koji/compose/ostree' nfs_src_dir: 'fedora_ostree_content/compose/ostree' - when: env != 'staging' and datacenter == 'phx2' + when: env != 'staging' and datacenter == 'iad2' - role: nfs/client mnt_dir: '/mnt/fedora_koji/koji/ostree' diff --git a/playbooks/manual/get-system-packages.yml b/playbooks/manual/get-system-packages.yml index e08b21a655..28206599ca 100644 --- a/playbooks/manual/get-system-packages.yml +++ b/playbooks/manual/get-system-packages.yml @@ -3,7 +3,7 @@ # - name: Get installed packages - hosts: builders:releng-compose:data-analysis01.phx2.fedoraproject.org + hosts: builders:releng-compose:data-analysis01.iad2.fedoraproject.org gather_facts: true user: root diff --git a/playbooks/manual/nagios/shush-fmn.yml b/playbooks/manual/nagios/shush-fmn.yml index 77423e1714..9e0251b75a 100644 --- a/playbooks/manual/nagios/shush-fmn.yml +++ b/playbooks/manual/nagios/shush-fmn.yml @@ -9,5 +9,5 @@ tasks: - name: tell nagios to shush. nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true diff --git a/playbooks/manual/push-badges.yml b/playbooks/manual/push-badges.yml index e5a840b7bd..83e7e2648e 100644 --- a/playbooks/manual/push-badges.yml +++ b/playbooks/manual/push-badges.yml @@ -8,7 +8,7 @@ # servers. - name: get the badges repo happening from the batcave - hosts: batcave01.phx2.fedoraproject.org + hosts: batcave01.iad2.fedoraproject.org user: root gather_facts: False diff --git a/playbooks/manual/rebuild/fedora-packages.yml b/playbooks/manual/rebuild/fedora-packages.yml index 80c49104f2..171b441ffb 100644 --- a/playbooks/manual/rebuild/fedora-packages.yml +++ b/playbooks/manual/rebuild/fedora-packages.yml @@ -17,7 +17,7 @@ tasks: - name: tell nagios to shush for these hosts nagios: action=downtime minutes=300 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true - name: stop the cache warmer @@ -81,5 +81,5 @@ - name: tell nagios to start bothering us again nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true diff --git a/playbooks/manual/releng-emergency-expire-old-repo.yml b/playbooks/manual/releng-emergency-expire-old-repo.yml index 797c3a6f84..0146cc900a 100644 --- a/playbooks/manual/releng-emergency-expire-old-repo.yml +++ b/playbooks/manual/releng-emergency-expire-old-repo.yml @@ -15,7 +15,7 @@ # Possible product: Fedora/EPEL/RHEL - name: Expire old repo files - hosts: mm-backend01.phx2.fedoraproject.org + hosts: mm-backend01.iad2.fedoraproject.org become_user: mirrormanager gather_facts: False diff --git a/playbooks/manual/restart-fedmsg-services.yml b/playbooks/manual/restart-fedmsg-services.yml index 9f35346169..25935a2ead 100644 --- a/playbooks/manual/restart-fedmsg-services.yml +++ b/playbooks/manual/restart-fedmsg-services.yml @@ -60,7 +60,7 @@ tasks: - name: schedule a 25 minute downtime. give notifs backend time to start up. nagios: action=downtime minutes=25 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true # - name: bounce the fmn-digests service # service: name=fmn-digests@1 state=restarted diff --git a/playbooks/manual/restart-pagure.yml b/playbooks/manual/restart-pagure.yml index bb2751e654..b20591245b 100644 --- a/playbooks/manual/restart-pagure.yml +++ b/playbooks/manual/restart-pagure.yml @@ -17,5 +17,5 @@ post_tasks: - name: tell nagios to unshush w.r.t. apache nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true diff --git a/playbooks/manual/sign-vault.yml b/playbooks/manual/sign-vault.yml index 9feca297cb..c4f09eb428 100644 --- a/playbooks/manual/sign-vault.yml +++ b/playbooks/manual/sign-vault.yml @@ -7,7 +7,7 @@ # Please check with rel-eng before doing anything here. - name: make sign-vault server vm (secondary and stg only) - hosts: sign-vault01.stg.phx2.fedoraproject.org + hosts: sign-vault01.stg.iad2.fedoraproject.org user: root gather_facts: False diff --git a/playbooks/manual/sync-old-pkl.yml b/playbooks/manual/sync-old-pkl.yml index a0548a8171..e365eb673a 100644 --- a/playbooks/manual/sync-old-pkl.yml +++ b/playbooks/manual/sync-old-pkl.yml @@ -1,5 +1,5 @@ - name: Do mm-backend stuff - hosts: mm-backend01.phx2.fedoraproject.org + hosts: mm-backend01.iad2.fedoraproject.org user: root vars_files: @@ -44,4 +44,4 @@ - name: Stop mirrorlist3 command: systemctl stop mirrorlist3 - when: datacenter == 'phx2' + when: datacenter == 'iad2' diff --git a/playbooks/manual/upgrade/badges.yml b/playbooks/manual/upgrade/badges.yml index c3688d2f9a..6ac54ffc24 100644 --- a/playbooks/manual/upgrade/badges.yml +++ b/playbooks/manual/upgrade/badges.yml @@ -75,7 +75,7 @@ pre_tasks: - name: tell nagios to shush w.r.t. the frontend nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true roles: @@ -97,7 +97,7 @@ pre_tasks: - name: tell nagios to shush w.r.t. the backend nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true roles: @@ -119,7 +119,7 @@ post_tasks: - name: tell nagios to unshush w.r.t. the backend nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true - name: restart the frontend @@ -138,5 +138,5 @@ post_tasks: - name: tell nagios to unshush w.r.t. the frontend nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true diff --git a/playbooks/manual/upgrade/bodhi.yml b/playbooks/manual/upgrade/bodhi.yml index c72e5c3f42..2527a16f33 100644 --- a/playbooks/manual/upgrade/bodhi.yml +++ b/playbooks/manual/upgrade/bodhi.yml @@ -70,7 +70,7 @@ pre_tasks: - name: tell nagios to shush w.r.t. the frontend nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true tasks: @@ -94,7 +94,7 @@ pre_tasks: - name: tell nagios to shush w.r.t. the backend nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true roles: @@ -125,7 +125,7 @@ post_tasks: - name: tell nagios to unshush w.r.t. the backend nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true - name: restart the frontend @@ -149,5 +149,5 @@ post_tasks: - name: tell nagios to unshush w.r.t. the frontend nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true diff --git a/playbooks/manual/upgrade/bugzilla2fedmsg.yml b/playbooks/manual/upgrade/bugzilla2fedmsg.yml index 89d0582301..413956cc10 100644 --- a/playbooks/manual/upgrade/bugzilla2fedmsg.yml +++ b/playbooks/manual/upgrade/bugzilla2fedmsg.yml @@ -34,7 +34,7 @@ pre_tasks: - name: tell nagios to shush nagios: action=downtime minutes=60 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true roles: @@ -44,5 +44,5 @@ - service: name="moksha-hub" state=restarted - name: tell nagios to unshush nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true diff --git a/playbooks/manual/upgrade/datagrepper.yml b/playbooks/manual/upgrade/datagrepper.yml index d9d3ecbde9..b14184f331 100644 --- a/playbooks/manual/upgrade/datagrepper.yml +++ b/playbooks/manual/upgrade/datagrepper.yml @@ -34,7 +34,7 @@ pre_tasks: - name: tell nagios to shush nagios: action=downtime minutes=60 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true roles: @@ -45,5 +45,5 @@ - name: tell nagios to unshush nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true diff --git a/playbooks/manual/upgrade/datanommer.yml b/playbooks/manual/upgrade/datanommer.yml index f47d1fec19..cc1a556a33 100644 --- a/playbooks/manual/upgrade/datanommer.yml +++ b/playbooks/manual/upgrade/datanommer.yml @@ -41,7 +41,7 @@ pre_tasks: - name: tell nagios to shush nagios: action=downtime minutes=120 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true roles: - badges/backend @@ -60,7 +60,7 @@ pre_tasks: - name: tell nagios to shush nagios: action=downtime minutes=120 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true roles: - datagrepper @@ -79,7 +79,7 @@ pre_tasks: - name: tell nagios to shush nagios: action=downtime minutes=120 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true roles: - notifs/frontend @@ -98,7 +98,7 @@ pre_tasks: - name: tell nagios to shush nagios: action=downtime minutes=120 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true roles: - fedmsg/datanommer @@ -119,7 +119,7 @@ post_tasks: - name: tell nagios to unshush nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true - name: restart the frontend pieces (fmn.web and datagrepper) @@ -138,7 +138,7 @@ post_tasks: - name: tell nagios to unshush nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true - name: restart the last backend piece (badges) @@ -155,5 +155,5 @@ post_tasks: - name: tell nagios to unshush nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true diff --git a/playbooks/manual/upgrade/fedimg.yml b/playbooks/manual/upgrade/fedimg.yml index 6fd74c2e15..9fe0086625 100644 --- a/playbooks/manual/upgrade/fedimg.yml +++ b/playbooks/manual/upgrade/fedimg.yml @@ -39,7 +39,7 @@ pre_tasks: - name: tell nagios to shush nagios: action=downtime minutes=60 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true roles: @@ -58,5 +58,5 @@ - service: name="fedmsg-hub" state=restarted - name: tell nagios to unshush nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true diff --git a/playbooks/manual/upgrade/fmn.yml b/playbooks/manual/upgrade/fmn.yml index b7aaf56a74..56e1264854 100644 --- a/playbooks/manual/upgrade/fmn.yml +++ b/playbooks/manual/upgrade/fmn.yml @@ -30,7 +30,7 @@ pre_tasks: - name: tell nagios to shush w.r.t. the frontend nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true roles: @@ -52,7 +52,7 @@ pre_tasks: - name: tell nagios to shush w.r.t. the backend nagios: action=downtime minutes=5 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true roles: @@ -101,7 +101,7 @@ #post_tasks: #- name: tell nagios to unshush w.r.t. the backend # nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - # delegate_to: noc01.phx2.fedoraproject.org + # delegate_to: noc01.iad2.fedoraproject.org # ignore_errors: true - name: restart the frontend @@ -120,5 +120,5 @@ post_tasks: - name: tell nagios to unshush w.r.t. the frontend nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true diff --git a/playbooks/manual/upgrade/koji.yml b/playbooks/manual/upgrade/koji.yml index 8455639039..16b828a906 100644 --- a/playbooks/manual/upgrade/koji.yml +++ b/playbooks/manual/upgrade/koji.yml @@ -45,7 +45,7 @@ - name: tell nagios that everything is fine nagios: action=downtime minutes=30 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true - name: stop httpd on the koji-hubs. @@ -91,7 +91,7 @@ service: name="httpd" state=started - name: unsilence nagios nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true - name: update and restart the koji builders, now that we're done with the hubs diff --git a/playbooks/manual/upgrade/mbs.yml b/playbooks/manual/upgrade/mbs.yml index 92f714454c..97f587fcbb 100644 --- a/playbooks/manual/upgrade/mbs.yml +++ b/playbooks/manual/upgrade/mbs.yml @@ -77,7 +77,7 @@ pre_tasks: - name: tell nagios to shush w.r.t. the frontend nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true roles: @@ -102,7 +102,7 @@ pre_tasks: - name: tell nagios to shush w.r.t. the backend nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true roles: @@ -128,7 +128,7 @@ post_tasks: - name: tell nagios to unshush w.r.t. the backend nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true - name: restart the frontend @@ -154,5 +154,5 @@ post_tasks: - name: tell nagios to unshush w.r.t. the frontend nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true diff --git a/playbooks/manual/upgrade/mote.yml b/playbooks/manual/upgrade/mote.yml index 3548a14a3c..da324727b3 100644 --- a/playbooks/manual/upgrade/mote.yml +++ b/playbooks/manual/upgrade/mote.yml @@ -34,7 +34,7 @@ pre_tasks: - name: tell nagios to shush nagios: action=downtime minutes=60 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true roles: @@ -45,5 +45,5 @@ - service: name="mote-updater" state=restarted - name: tell nagios to unshush nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true diff --git a/playbooks/manual/upgrade/odcs.yml b/playbooks/manual/upgrade/odcs.yml index e7cecd15b3..eee3fb7e7c 100644 --- a/playbooks/manual/upgrade/odcs.yml +++ b/playbooks/manual/upgrade/odcs.yml @@ -59,7 +59,7 @@ pre_tasks: - name: tell nagios to shush w.r.t. the frontend nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true roles: @@ -85,7 +85,7 @@ pre_tasks: - name: tell nagios to shush w.r.t. the backend nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true roles: @@ -95,7 +95,7 @@ post_tasks: - name: tell nagios to unshush w.r.t. the backend nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true - name: restart the frontend @@ -115,5 +115,5 @@ post_tasks: - name: tell nagios to unshush w.r.t. the frontend nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true diff --git a/playbooks/manual/upgrade/packages.yml b/playbooks/manual/upgrade/packages.yml index a4d522c6ae..74e5aee6ab 100644 --- a/playbooks/manual/upgrade/packages.yml +++ b/playbooks/manual/upgrade/packages.yml @@ -34,7 +34,7 @@ pre_tasks: - name: tell nagios to shush nagios: action=downtime minutes=60 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true roles: @@ -49,5 +49,5 @@ - name: tell nagios to unshush nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true diff --git a/playbooks/manual/upgrade/pagure.yml b/playbooks/manual/upgrade/pagure.yml index e5489405b0..b5242d9df4 100644 --- a/playbooks/manual/upgrade/pagure.yml +++ b/playbooks/manual/upgrade/pagure.yml @@ -28,7 +28,7 @@ minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true ## @@ -123,5 +123,5 @@ action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true diff --git a/playbooks/manual/upgrade/pdc.yml b/playbooks/manual/upgrade/pdc.yml index a11d2ee9de..78d965ce82 100644 --- a/playbooks/manual/upgrade/pdc.yml +++ b/playbooks/manual/upgrade/pdc.yml @@ -23,7 +23,7 @@ post_tasks: - name: tell nagios to shush w.r.t. the backend nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true - name: Stop the pdc-updater backend service: name="fedmsg-hub" state=stopped @@ -54,7 +54,7 @@ post_tasks: - name: tell nagios to shush w.r.t. the frontend nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true - service: name="httpd" state=stopped - name: Upgrade the database, only on the primary web node. @@ -65,7 +65,7 @@ - service: name="httpd" state=started - name: tell nagios to unshush w.r.t. the frontend nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true - name: restart the backend @@ -83,5 +83,5 @@ service: name="fedmsg-hub" state=started - name: tell nagios to unshush w.r.t. the backend nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true diff --git a/playbooks/run_fasClient.yml b/playbooks/run_fasClient.yml index 57d8696b35..9c00ef3eeb 100644 --- a/playbooks/run_fasClient.yml +++ b/playbooks/run_fasClient.yml @@ -4,7 +4,7 @@ # - name: run fasClient -a to make email aliases on bastion - hosts: bastion01.phx2.fedoraproject.org:bastion02.phx2.fedoraproject.org:bastion01.iad2.fedoraproject.org:bastion02.iad2.fedoraproject.org + hosts: bastion01.iad2.fedoraproject.org:bastion02.iad2.fedoraproject.org:bastion01.iad2.fedoraproject.org:bastion02.iad2.fedoraproject.org user: root gather_facts: False @@ -15,7 +15,7 @@ when: inventory_hostname_short.startswith('bastion0') - name: run fasClient on people and pkgs first as these are the ones most people want updated - hosts: people02.fedoraproject.org:pkgs02.phx2.fedoraproject.org + hosts: people02.fedoraproject.org:pkgs01.iad2.fedoraproject.org user: root gather_facts: False @@ -25,7 +25,7 @@ ignore_errors: true - name: run fasClient -i on the rest of hosts which only affects sysadmins - hosts: all:!builders:!*cloud*:!*composer*:!people*:!pkgs02*:!*.stg.*:!twisted*:!*.fedorainfracloud.org:!bkernel*:!autosign*:!*.app.os.fedoraproject.org:!*.app.os.stg.fedoraproject.org + hosts: all:!builders:!*cloud*:!*composer*:!people*:!pkgs01*:!*.stg.*:!twisted*:!*.fedorainfracloud.org:!bkernel*:!autosign*:!*.app.os.fedoraproject.org:!*.app.os.stg.fedoraproject.org user: root gather_facts: False diff --git a/playbooks/run_fasClient_simple.yml b/playbooks/run_fasClient_simple.yml index f8212aa025..37ff6ec8bd 100644 --- a/playbooks/run_fasClient_simple.yml +++ b/playbooks/run_fasClient_simple.yml @@ -3,7 +3,7 @@ # - name: run fasClient -a to make email aliases on bastion - hosts: bastion01.phx2.fedoraproject.org:bastion02.phx2.fedoraproject.org:bastion01.iad2.fedoraproject.org:bastion02.iad2.fedoraproject.org + hosts: bastion01.iad2.fedoraproject.org:bastion02.iad2.fedoraproject.org:bastion01.iad2.fedoraproject.org:bastion02.iad2.fedoraproject.org user: root gather_facts: False @@ -14,7 +14,7 @@ ignore_errors: true - name: run fasClient on people and pkgs first as these are the ones most people want updated - hosts: people02.fedoraproject.org:pkgs02.phx2.fedoraproject.org + hosts: people02.fedoraproject.org:pkgs01.iad2.fedoraproject.org user: root gather_facts: False diff --git a/playbooks/universe_update.yml b/playbooks/universe_update.yml index c036849769..3a8f043a02 100644 --- a/playbooks/universe_update.yml +++ b/playbooks/universe_update.yml @@ -12,7 +12,7 @@ - name: silence nagios completely nagios: action=silence - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true failed_when: no when: nonagios is not defined or not "true" in nonagios diff --git a/playbooks/update_ticketkey.yml b/playbooks/update_ticketkey.yml index 2a79e8f8e5..5f24193eae 100644 --- a/playbooks/update_ticketkey.yml +++ b/playbooks/update_ticketkey.yml @@ -1,5 +1,5 @@ - name: make a new ssl ticketkey - hosts: batcave01.phx2.fedoraproject.org + hosts: batcave01.iad2.fedoraproject.org user: root vars_files: diff --git a/playbooks/vhost_halt_guests.yml b/playbooks/vhost_halt_guests.yml index 083147c358..f2bb4577f0 100644 --- a/playbooks/vhost_halt_guests.yml +++ b/playbooks/vhost_halt_guests.yml @@ -41,7 +41,7 @@ tasks: - name: tell nagios to shush nagios: action=silence host={{ inventory_hostname_short }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org - name: echo-y command: /sbin/halt -p diff --git a/playbooks/vhost_reboot.yml b/playbooks/vhost_reboot.yml index 26187cec60..ee072b33d4 100644 --- a/playbooks/vhost_reboot.yml +++ b/playbooks/vhost_reboot.yml @@ -47,17 +47,17 @@ - name: figure out which node to delegate os cordon to set_fact: os_delegate_via: os-master01 - when: ( hostvars[inventory_hostname].vmhost != hostvars['os-master01.phx2.fedoraproject.org'].vmhost and hostvars[inventory_hostname].datacenter == 'phx2') or ( hostvars['os-master01.iad2.fedoraproject.org'].vmhost and hostvars[inventory_hostname].datacenter == 'iad2') + when: hostvars['os-master01.iad2.fedoraproject.org'].vmhost and hostvars[inventory_hostname].datacenter == 'iad2' - name: figure out which node to delegate os cordon to set_fact: os_delegate_via: os-master02 - when: ( hostvars[inventory_hostname].vmhost != hostvars['os-master02.phx2.fedoraproject.org'].vmhost and hostvars[inventory_hostname].datacenter == 'phx2') or ( hostvars['os-master02.iad2.fedoraproject.org'].vmhost and hostvars[inventory_hostname].datacenter == 'iad2') + when: hostvars['os-master02.iad2.fedoraproject.org'].vmhost and hostvars[inventory_hostname].datacenter == 'iad2' - name: figure out which node to delegate os cordon to set_fact: os_delegate_via: os-master03 - when: ( hostvars[inventory_hostname].vmhost != hostvars['os-master03.phx2.fedoraproject.org'].vmhost and hostvars[inventory_hostname].datacenter == 'phx2') or ( hostvars['os-master03.iad2.fedoraproject.org'].vmhost and hostvars[inventory_hostname].datacenter == 'iad2') + when: hostvars['os-master03.iad2.fedoraproject.org'].vmhost and hostvars[inventory_hostname].datacenter == 'iad2' - name: drain OS node if necessary command: oc adm drain {{inventory_hostname }} --ignore-daemonsets --delete-local-data @@ -71,7 +71,7 @@ - name: schedule regular host downtime nagios: action=downtime minutes=30 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true when: nonagios is not defined or not nonagios @@ -97,7 +97,7 @@ tasks: - name: tell nagios to shush nagios: action=downtime minutes=60 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true when: nonagios is not defined or not nonagios @@ -120,7 +120,7 @@ - name: tell nagios to unshush nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true when: nonagios is not defined or not nonagios @@ -134,25 +134,19 @@ - name: figure out which node to delegate os uncordon to set_fact: os_delegate_via: os-master01 - when: ( hostvars[inventory_hostname].vmhost != hostvars['os-master01.phx2.fedoraproject.org'].vmhost and hostvars[inventory_hostname].datacenter == 'phx2') or ( hostvars['os-master01.iad2.fedoraproject.org'].vmhost and hostvars[inventory_hostname].datacenter == 'iad2') + when: hostvars['os-master01.iad2.fedoraproject.org'].vmhost and hostvars[inventory_hostname].datacenter == 'iad2' - name: figure out which node to delegate os uncordon to set_fact: os_delegate_via: os-master02 - when: ( hostvars[inventory_hostname].vmhost != hostvars['os-master02.phx2.fedoraproject.org'].vmhost and hostvars[inventory_hostname].datacenter == 'phx2') or ( hostvars['os-master02.iad2.fedoraproject.org'].vmhost and hostvars[inventory_hostname].datacenter == 'iad2') + when: hostvars['os-master02.iad2.fedoraproject.org'].vmhost and hostvars[inventory_hostname].datacenter == 'iad2' - name: figure out which node to delegate os uncordon to set_fact: os_delegate_via: os-master03 - when: ( hostvars[inventory_hostname].vmhost != hostvars['os-master03.phx2.fedoraproject.org'].vmhost and hostvars[inventory_hostname].datacenter == 'phx2') or ( hostvars['os-master03.iad2.fedoraproject.org'].vmhost and hostvars[inventory_hostname].datacenter == 'iad2') - - - - name: Add back to openshift - command: oc adm uncordon {{inventory_hostname}} - delegate_to: "{{os_delegate_via}}{{env_suffix}}.phx2.fedoraproject.org" - when: inventory_hostname.startswith(('os-node', 'os-master')) and hostvars[inventory_hostname].datacenter == 'phx2' + when: hostvars['os-master03.iad2.fedoraproject.org'].vmhost and hostvars[inventory_hostname].datacenter == 'iad2' - name: Add back to openshift command: oc adm uncordon {{inventory_hostname}} diff --git a/playbooks/vhost_update.yml b/playbooks/vhost_update.yml index a378edbcff..0ed67cc7ee 100644 --- a/playbooks/vhost_update.yml +++ b/playbooks/vhost_update.yml @@ -31,7 +31,7 @@ - name: schedule regular host downtime nagios: action=downtime minutes=30 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.phx2.fedoraproject.org + delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true failed_when: no when: nonagios is not defined or not "true" in nonagios diff --git a/roles/base/files/postfix/main.cf/main.cf.mailman b/roles/base/files/postfix/main.cf/main.cf.mailman index 30003d2c62..b32cc033d9 100644 --- a/roles/base/files/postfix/main.cf/main.cf.mailman +++ b/roles/base/files/postfix/main.cf/main.cf.mailman @@ -315,7 +315,7 @@ unknown_local_recipient_reject_code = 550 #relayhost = [mailserver.isp.tld] #relayhost = uucphost #relayhost = [an.ip.add.ress] -relayhost = bastion.phx2.fedoraproject.org +relayhost = bastion.iad2.fedoraproject.org # REJECTING UNKNOWN RELAY USERS diff --git a/roles/base/files/postfix/main.cf/main.cf.mailman01.stg.phx2.fedoraproject.org b/roles/base/files/postfix/main.cf/main.cf.mailman01.stg.phx2.fedoraproject.org index 44e1e1dd97..2c4457537c 100644 --- a/roles/base/files/postfix/main.cf/main.cf.mailman01.stg.phx2.fedoraproject.org +++ b/roles/base/files/postfix/main.cf/main.cf.mailman01.stg.phx2.fedoraproject.org @@ -315,7 +315,7 @@ unknown_local_recipient_reject_code = 550 #relayhost = [mailserver.isp.tld] #relayhost = uucphost #relayhost = [an.ip.add.ress] -relayhost = bastion.phx2.fedoraproject.org +relayhost = bastion.iad2.fedoraproject.org # REJECTING UNKNOWN RELAY USERS diff --git a/roles/base/files/postfix/main.cf/main.cf.phx2 b/roles/base/files/postfix/main.cf/main.cf.phx2 index 563872d44f..0949716043 100644 --- a/roles/base/files/postfix/main.cf/main.cf.phx2 +++ b/roles/base/files/postfix/main.cf/main.cf.phx2 @@ -313,7 +313,7 @@ unknown_local_recipient_reject_code = 550 #relayhost = [mailserver.isp.tld] #relayhost = uucphost #relayhost = [an.ip.add.ress] -relayhost = bastion.phx2.fedoraproject.org +relayhost = bastion.iad2.fedoraproject.org # REJECTING UNKNOWN RELAY USERS diff --git a/roles/base/files/postfix/main.cf/main.cf.releng b/roles/base/files/postfix/main.cf/main.cf.releng index dffe3b9136..9865a6b398 100644 --- a/roles/base/files/postfix/main.cf/main.cf.releng +++ b/roles/base/files/postfix/main.cf/main.cf.releng @@ -313,7 +313,7 @@ unknown_local_recipient_reject_code = 550 #relayhost = [mailserver.isp.tld] #relayhost = uucphost #relayhost = [an.ip.add.ress] -relayhost = bastion.phx2.fedoraproject.org +relayhost = bastion.iad2.fedoraproject.org # REJECTING UNKNOWN RELAY USERS diff --git a/roles/base/files/postfix/main.cf/main.cf.staging b/roles/base/files/postfix/main.cf/main.cf.staging index da8c6c95bb..8ad103215c 100644 --- a/roles/base/files/postfix/main.cf/main.cf.staging +++ b/roles/base/files/postfix/main.cf/main.cf.staging @@ -313,7 +313,7 @@ unknown_local_recipient_reject_code = 550 #relayhost = [mailserver.isp.tld] #relayhost = uucphost #relayhost = [an.ip.add.ress] -relayhost = bastion.phx2.fedoraproject.org +relayhost = bastion.iad2.fedoraproject.org # REJECTING UNKNOWN RELAY USERS diff --git a/roles/base/files/resolv.conf/phx2 b/roles/base/files/resolv.conf/phx2 deleted file mode 100644 index 426f4cd7fb..0000000000 --- a/roles/base/files/resolv.conf/phx2 +++ /dev/null @@ -1,6 +0,0 @@ -search phx2.fedoraproject.org vpn.fedoraproject.org fedoraproject.org -nameserver 10.5.126.21 -nameserver 10.5.126.22 -options rotate timeout:1 - - diff --git a/roles/base/files/resolv.conf/qa b/roles/base/files/resolv.conf/qa deleted file mode 100644 index 5bc8edf5d4..0000000000 --- a/roles/base/files/resolv.conf/qa +++ /dev/null @@ -1,6 +0,0 @@ -search qa.fedoraproject.org phx2.fedoraproject.org vpn.fedoraproject.org fedoraproject.org -nameserver 10.5.126.21 -nameserver 10.5.126.22 -options rotate timeout:1 - - diff --git a/roles/base/templates/iptables/iptables.download-phx2 b/roles/base/templates/iptables/iptables.download-phx2 deleted file mode 100644 index a24d2c0ce0..0000000000 --- a/roles/base/templates/iptables/iptables.download-phx2 +++ /dev/null @@ -1,116 +0,0 @@ -# {{ ansible_managed }} -*filter -:INPUT ACCEPT [0:0] -:FORWARD ACCEPT [0:0] -:OUTPUT ACCEPT [0:0] - -# allow ping and traceroute --A INPUT -p icmp -j ACCEPT - -# localhost is fine --A INPUT -i lo -j ACCEPT - -# Established connections allowed --A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT --A OUTPUT -m state --state RELATED,ESTABLISHED -j ACCEPT - -# allow ssh - always --A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 22 -j ACCEPT - -# for nrpe - allow it from nocs --A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.10 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.166 -j ACCEPT -# FIXME - this is the global nat-ip and we need the noc01-specific ip --A INPUT -p tcp -m tcp --dport 5666 -s 209.132.181.102 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 209.132.181.35 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 10.5.126.41 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 10.5.126.241 -j ACCEPT - -{% if env != 'staging' and datacenter == 'phx2' and inventory_hostname not in groups['staging_friendly'] %} -# -# In the phx2 datacenter, both production and staging hosts are in the same -# subnet/vlan. We want production hosts to reject connectons from staging group hosts -# to prevent them from interfering with production. There are however a few hosts in -# production we have marked 'staging-friendly' that we do allow staging to talk to for -# mostly read-only data they need. -# -{% for host in groups['staging']|sort %} -{% if 'eth0_ip' in hostvars[host] %}# {{ host }} --A INPUT -s {{ hostvars[host]['eth0_ip'] }} -j REJECT --reject-with icmp-host-prohibited -{% else %}# {{ host }} has no 'eth0_ip' listed -{% endif %} -{% endfor %} -{% endif %} - -{% if ansible_domain == 'qa.fedoraproject.org' and inventory_hostname not in groups['qa_isolated'] %} -# -# In the qa.fedoraproject.org network, we want machines not in the qa-isolated group -# to block all access from that group. This is to protect them from any possible attack -# vectors from qa-isolated machines. -# -# Here we hard code beaker client nodes. They are managed by beaker and are not in ansible. --A INPUT -s 10.5.131.31 -j REJECT --reject-with icmp-host-prohibited --A INPUT -s 10.5.131.32 -j REJECT --reject-with icmp-host-prohibited --A INPUT -s 10.5.131.33 -j REJECT --reject-with icmp-host-prohibited --A INPUT -s 10.5.131.34 -j REJECT --reject-with icmp-host-prohibited --A INPUT -s 10.5.131.35 -j REJECT --reject-with icmp-host-prohibited --A INPUT -s 10.5.131.36 -j REJECT --reject-with icmp-host-prohibited --A INPUT -s 10.5.131.37 -j REJECT --reject-with icmp-host-prohibited --A INPUT -s 10.5.131.38 -j REJECT --reject-with icmp-host-prohibited --A INPUT -s 10.5.131.39 -j REJECT --reject-with icmp-host-prohibited --A INPUT -s 10.5.131.40 -j REJECT --reject-with icmp-host-prohibited --A INPUT -s 10.5.131.41 -j REJECT --reject-with icmp-host-prohibited --A INPUT -s 10.5.131.42 -j REJECT --reject-with icmp-host-prohibited --A INPUT -s 10.5.131.43 -j REJECT --reject-with icmp-host-prohibited --A INPUT -s 10.5.131.44 -j REJECT --reject-with icmp-host-prohibited --A INPUT -s 10.5.131.45 -j REJECT --reject-with icmp-host-prohibited --A INPUT -s 10.5.131.46 -j REJECT --reject-with icmp-host-prohibited --A INPUT -s 10.5.131.47 -j REJECT --reject-with icmp-host-prohibited --A INPUT -s 10.5.131.48 -j REJECT --reject-with icmp-host-prohibited --A INPUT -s 10.5.131.49 -j REJECT --reject-with icmp-host-prohibited -{% for host in groups['qa_isolated']|sort %} -{% if 'eth0_ip' in hostvars[host] %}# {{ host }} --A INPUT -s {{ hostvars[host]['eth0_ip'] }} -j REJECT --reject-with icmp-host-prohibited -{% else %}# {{ host }} has no 'eth0_ip' listed -{% endif %} -{% endfor %} -{% endif %} -# if the host declares a fedmsg-enabled wsgi app, open ports for it -{% if wsgi_fedmsg_service is defined %} -{% for i in range(wsgi_procs * wsgi_threads) %} --A INPUT -p tcp -m tcp --dport 30{{ '%02d' % i }} -j ACCEPT -{% endfor %} -{% endif %} - -# if the blocked_ips is defined - drop them -{% if blocked_ips is defined %} -{% for ip in blocked_ips %} --A INPUT -s {{ ip }} -j DROP -{% endfor %} -{% endif %} - -# if the host/group defines incoming tcp_ports - allow them -{% if tcp_ports is defined %} -{% for port in tcp_ports %} --A INPUT -p tcp -m tcp --dport {{ port }} -j ACCEPT -{% endfor %} -{% endif %} - -# if the host/group defines incoming udp_ports - allow them -{% if udp_ports is defined %} -{% for port in udp_ports %} --A INPUT -p udp -m udp --dport {{ port }} -j ACCEPT -{% endfor %} -{% endif %} - -# if there are custom rules - put them in as-is -{% if custom_rules is defined %} -{% for rule in custom_rules %} -{{ rule }} -{% endfor %} -{% endif %} - -# otherwise kick everything out --A INPUT -j REJECT --reject-with icmp-host-prohibited --A FORWARD -j REJECT --reject-with icmp-host-prohibited -COMMIT diff --git a/roles/base/templates/iptables/iptables.mm-frontend-checkin01.phx2.fedoraproject.org b/roles/base/templates/iptables/iptables.mm-frontend-checkin01.phx2.fedoraproject.org deleted file mode 100644 index 3563088b4a..0000000000 --- a/roles/base/templates/iptables/iptables.mm-frontend-checkin01.phx2.fedoraproject.org +++ /dev/null @@ -1,64 +0,0 @@ -# {{ ansible_managed }} -*filter -:INPUT ACCEPT [0:0] -:FORWARD ACCEPT [0:0] -:OUTPUT ACCEPT [0:0] - -# allow ping and traceroute --A INPUT -p icmp -j ACCEPT - -# localhost is fine --A INPUT -i lo -j ACCEPT - -# Established connections allowed --A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT --A OUTPUT -m state --state RELATED,ESTABLISHED -j ACCEPT - -# allow ssh - always --A INPUT -m conntrack --ctstate NEW --src 10.5.126.23 -m tcp -p tcp --dport 22 -j ACCEPT - -# for nrpe - allow it from nocs --A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.10 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.166 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 10.5.126.41 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 10.5.126.241 -j ACCEPT - -{% for port in tcp_ports %} --A INPUT -p tcp -m tcp --dport {{ port }} -j ACCEPT -{% endfor %} - -# Allow connection to the database --A OUTPUT --dst 10.5.126.71 -p tcp -m tcp --dport 5432 -j ACCEPT - -# Allow DNS --A OUTPUT --dst 10.5.126.21 -p udp -m udp --dport 53 -j ACCEPT --A OUTPUT --dst 10.5.126.21 -p tcp -m tcp --dport 53 -j ACCEPT --A OUTPUT --dst 10.5.126.22 -p udp -m udp --dport 53 -j ACCEPT --A OUTPUT --dst 10.5.126.22 -p tcp -m tcp --dport 53 -j ACCEPT - -# Allow totpcgi --A OUTPUT --dst 10.5.126.25 -p tcp -m tcp --dport 8443 -j ACCEPT --A OUTPUT --dst 10.5.126.26 -p tcp -m tcp --dport 8443 -j ACCEPT --A OUTPUT --dst 10.5.126.30 -p tcp -m tcp --dport 8443 -j ACCEPT - -# Allow infrastructure.fp.o http and https --A OUTPUT --dst 10.5.126.23 -p tcp -m tcp --dport 80 -j ACCEPT --A OUTPUT --dst 10.5.126.23 -p tcp -m tcp --dport 443 -j ACCEPT - -# Allow https to proxies --A OUTPUT --dst 10.5.126.8 -p tcp -m tcp --dport 443 -j ACCEPT --A OUTPUT --dst 10.5.126.9 -p tcp -m tcp --dport 443 -j ACCEPT --A OUTPUT --dst 10.5.126.51 -p tcp -m tcp --dport 443 -j ACCEPT --A OUTPUT --dst 10.5.126.52 -p tcp -m tcp --dport 443 -j ACCEPT - -# Allow VPN access --A OUTPUT --dst 10.5.126.11 -p udp -m udp --dport 1194 -j ACCEPT --A OUTPUT --dst 10.5.126.12 -p udp -m udp --dport 1194 -j ACCEPT - -# otherwise kick everything out --A INPUT -j REJECT --reject-with icmp-host-prohibited --A FORWARD -j REJECT --reject-with icmp-host-prohibited - -# This box is special in that it also has OUTPUT filtered --A OUTPUT -j REJECT --reject-with icmp-host-prohibited -COMMIT diff --git a/roles/base/templates/iptables/iptables.ns03.phx2.fedoraproject.org b/roles/base/templates/iptables/iptables.ns03.phx2.fedoraproject.org deleted file mode 100644 index 63b74b997d..0000000000 --- a/roles/base/templates/iptables/iptables.ns03.phx2.fedoraproject.org +++ /dev/null @@ -1,106 +0,0 @@ -# {{ ansible_managed }} -*filter -:INPUT ACCEPT [0:0] -:FORWARD ACCEPT [0:0] -:OUTPUT ACCEPT [0:0] - -# allow ping and traceroute --A INPUT -p icmp -j ACCEPT - -# localhost is fine --A INPUT -i lo -j ACCEPT - -# Established connections allowed --A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT --A OUTPUT -m state --state RELATED,ESTABLISHED -j ACCEPT - -# if the blocked_ips is defined - drop them -{% if blocked_ips is defined %} -{% for ip in blocked_ips %} --A INPUT -s {{ ip }} -j DROP -{% endfor %} -{% endif %} - -# allow ssh - always --A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 22 -j ACCEPT - -# for nrpe - allow it from nocs --A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.10 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.166 -j ACCEPT -# FIXME - this is the global nat-ip and we need the noc01-specific ip --A INPUT -p tcp -m tcp --dport 5666 -s 209.132.181.102 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 209.132.181.35 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 10.5.126.41 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 10.5.126.241 -j ACCEPT - -{% if env != 'staging' and datacenter == 'phx2' and inventory_hostname not in groups['staging_friendly'] %} -# -# In the phx2 datacenter, both production and staging hosts are in the same -# subnet/vlan. We want production hosts to reject connectons from staging group hosts -# to prevent them from interfering with production. There are however a few hosts in -# production we have marked 'staging-friendly' that we do allow staging to talk to for -# mostly read-only data they need. -# -{% for host in groups['staging']|sort %} -{% if 'eth0_ip' in hostvars[host] %}# {{ host }} --A INPUT -s {{ hostvars[host]['eth0_ip'] }} -j REJECT --reject-with icmp-host-prohibited -{% else %}# {{ host }} has no 'eth0_ip' listed -{% endif %} -{% endfor %} -{% endif %} - -{% if ansible_domain == 'qa.fedoraproject.org' and inventory_hostname not in groups['qa_isolated'] %} -# -# In the qa.fedoraproject.org network, we want machines not in the qa-isolated group -# to block all access from that group. This is to protect them from any possible attack -# vectors from qa-isolated machines. -# -{% for host in groups['qa_isolated']|sort %} -{% if 'eth0_ip' in hostvars[host] %}# {{ host }} --A INPUT -s {{ hostvars[host]['eth0_ip'] }} -j REJECT --reject-with icmp-host-prohibited -{% else %}# {{ host }} has no 'eth0_ip' listed -{% endif %} -{% endfor %} -{% endif %} -# if the host declares a fedmsg-enabled wsgi app, open ports for it -{% if wsgi_fedmsg_service is defined %} -{% for i in range(wsgi_procs * wsgi_threads) %} --A INPUT -p tcp -m tcp --dport 30{{ '%02d' % i }} -j ACCEPT -{% endfor %} -{% endif %} - - -# if the host/group defines incoming tcp_ports - allow them -{% if tcp_ports is defined %} -{% for port in tcp_ports %} --A INPUT -p tcp -m tcp --dport {{ port }} -j ACCEPT -{% endfor %} -{% endif %} - -# if the host/group defines incoming udp_ports - allow them -{% if udp_ports is defined %} -{% for port in udp_ports %} --A INPUT -p udp -m udp --dport {{ port }} -j ACCEPT -{% endfor %} -{% endif %} - -# if there are custom rules - put them in as-is -{% if custom_rules is defined %} -{% for rule in custom_rules %} -{{ rule }} -{% endfor %} -{% endif %} - -# otherwise kick everything out --A INPUT -j REJECT --reject-with icmp-host-prohibited --A FORWARD -j REJECT --reject-with icmp-host-prohibited -COMMIT -*raw -:PREROUTING ACCEPT [0:0] -:OUTPUT ACCEPT [0:0] -# -# We don't want to track all the dns query connections, there's too many. -# --A PREROUTING -p udp -m udp --dport 53 -j NOTRACK --A OUTPUT -p udp -m udp --sport 53 -j NOTRACK -COMMIT diff --git a/roles/base/templates/iptables/iptables.ns04.phx2.fedoraproject.org b/roles/base/templates/iptables/iptables.ns04.phx2.fedoraproject.org deleted file mode 100644 index 63b74b997d..0000000000 --- a/roles/base/templates/iptables/iptables.ns04.phx2.fedoraproject.org +++ /dev/null @@ -1,106 +0,0 @@ -# {{ ansible_managed }} -*filter -:INPUT ACCEPT [0:0] -:FORWARD ACCEPT [0:0] -:OUTPUT ACCEPT [0:0] - -# allow ping and traceroute --A INPUT -p icmp -j ACCEPT - -# localhost is fine --A INPUT -i lo -j ACCEPT - -# Established connections allowed --A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT --A OUTPUT -m state --state RELATED,ESTABLISHED -j ACCEPT - -# if the blocked_ips is defined - drop them -{% if blocked_ips is defined %} -{% for ip in blocked_ips %} --A INPUT -s {{ ip }} -j DROP -{% endfor %} -{% endif %} - -# allow ssh - always --A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 22 -j ACCEPT - -# for nrpe - allow it from nocs --A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.10 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.166 -j ACCEPT -# FIXME - this is the global nat-ip and we need the noc01-specific ip --A INPUT -p tcp -m tcp --dport 5666 -s 209.132.181.102 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 209.132.181.35 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 10.5.126.41 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 10.5.126.241 -j ACCEPT - -{% if env != 'staging' and datacenter == 'phx2' and inventory_hostname not in groups['staging_friendly'] %} -# -# In the phx2 datacenter, both production and staging hosts are in the same -# subnet/vlan. We want production hosts to reject connectons from staging group hosts -# to prevent them from interfering with production. There are however a few hosts in -# production we have marked 'staging-friendly' that we do allow staging to talk to for -# mostly read-only data they need. -# -{% for host in groups['staging']|sort %} -{% if 'eth0_ip' in hostvars[host] %}# {{ host }} --A INPUT -s {{ hostvars[host]['eth0_ip'] }} -j REJECT --reject-with icmp-host-prohibited -{% else %}# {{ host }} has no 'eth0_ip' listed -{% endif %} -{% endfor %} -{% endif %} - -{% if ansible_domain == 'qa.fedoraproject.org' and inventory_hostname not in groups['qa_isolated'] %} -# -# In the qa.fedoraproject.org network, we want machines not in the qa-isolated group -# to block all access from that group. This is to protect them from any possible attack -# vectors from qa-isolated machines. -# -{% for host in groups['qa_isolated']|sort %} -{% if 'eth0_ip' in hostvars[host] %}# {{ host }} --A INPUT -s {{ hostvars[host]['eth0_ip'] }} -j REJECT --reject-with icmp-host-prohibited -{% else %}# {{ host }} has no 'eth0_ip' listed -{% endif %} -{% endfor %} -{% endif %} -# if the host declares a fedmsg-enabled wsgi app, open ports for it -{% if wsgi_fedmsg_service is defined %} -{% for i in range(wsgi_procs * wsgi_threads) %} --A INPUT -p tcp -m tcp --dport 30{{ '%02d' % i }} -j ACCEPT -{% endfor %} -{% endif %} - - -# if the host/group defines incoming tcp_ports - allow them -{% if tcp_ports is defined %} -{% for port in tcp_ports %} --A INPUT -p tcp -m tcp --dport {{ port }} -j ACCEPT -{% endfor %} -{% endif %} - -# if the host/group defines incoming udp_ports - allow them -{% if udp_ports is defined %} -{% for port in udp_ports %} --A INPUT -p udp -m udp --dport {{ port }} -j ACCEPT -{% endfor %} -{% endif %} - -# if there are custom rules - put them in as-is -{% if custom_rules is defined %} -{% for rule in custom_rules %} -{{ rule }} -{% endfor %} -{% endif %} - -# otherwise kick everything out --A INPUT -j REJECT --reject-with icmp-host-prohibited --A FORWARD -j REJECT --reject-with icmp-host-prohibited -COMMIT -*raw -:PREROUTING ACCEPT [0:0] -:OUTPUT ACCEPT [0:0] -# -# We don't want to track all the dns query connections, there's too many. -# --A PREROUTING -p udp -m udp --dport 53 -j NOTRACK --A OUTPUT -p udp -m udp --sport 53 -j NOTRACK -COMMIT diff --git a/roles/batcave/files/ssh_known_hosts b/roles/batcave/files/ssh_known_hosts index ed68d2d936..4c21bb5350 100644 --- a/roles/batcave/files/ssh_known_hosts +++ b/roles/batcave/files/ssh_known_hosts @@ -1,2 +1,2 @@ -@cert-authority *.fedoraproject.org,*.phx2.fedoraproject.org,*.qa.fedoraproject.org,*.fedorainfracloud.org,fedorapeople.org,*.arm.fedoraproject.org,*.s390.fedoraproject.org,*.ppc.fedoraproject.org,pagure.io,*.fedorainfracloud.org,*.aws.fedoraproject.org,*.cloud.fedoraproject.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCZDS6lxxFrx4c+voCOCwljEqBfqRrEIPQc+J7vCwiRptkFR2InBbvtsYZZElH6shR7YcHzWszNgFz1hAJO1z7AjA81li6esvKQfa4tfaI8Ryx8gHf8aXGjekioJ76T/CYQXHjOXHdKOkAQFMp7a3NmkyxTnt1027eBjSQ4pKnu+OCY5ujqp/hQOnTs67bNKHFljcF/Os7uBOM2EVgPFU/slJV321fBdw1fHFkzsu/AJDLr2RVUquZ6migYP0icEL8yRvriSi5Wbq9iGsoG+nrw5vNjD1TJxBfnMBxSVhzX3UgL5Ucg5Rl1Mx33olKTdSnFCLfWoYAdZs6m7I5/LXH+s2Qz4GobgxkKdWWQgZH+VjwUPgMJwyfkV1klWu9213fYnIiPVWHYIL5ESLHtOKjSaHy7SoEuv4WDq+KBwOFB6WO/v19YrgYJAHiJQ/By4AZyjdh3mVPPu4VeD1wuDUXtLbRjxJS7QodZrlr6BtjcQ/9l4xgbkX/RnpNAri8s/SMHaSCrpH9IsefV0owRkvadSGYBUp7VcBkiJ4zjMJwAfvFBrhVGN/C5nXbLIDYxsiKQP8Jp2KBAlprza7febpdDLglnVQqtjW9VgIUgcpYtrSi45ehJ7z1fpHTWW3Gz53e4s7v5znZ1iT/Nn+Cqzvw3yNtTbz706muEq6Y+EdYohQ== fedoraproject.org -@cert-authority *.qa.fedoraproject.org,pagure-stg01.fedoraproject.org,*.stg.fedoraproject.org,*.stg.phx2.fedoraproject.org,stg.pagure.io,*.stg.arm.fedoraproject.org,*.stg.s390.fedoraproject.org,*.stg.ppc.fedoraproject.org,*.cloud.fedoraproject.org,*.arm.fedoraproject.org,*.aws.fedoraproject.org,*.fedorainfracloud.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDijAoR3tCmVi9yj0L4oaVfpHKIQoGYTVvSlXz6elL/X8YIbubVG6e0lhO3xadoD6wpi9+c1Zu3oc/WZAzx5/iuJD2m4cLgDdVt3CcAS4PyCW+YKI99pijlZlOHgBR/o3zU4PmERSViCYhGBYyBDlyiNg0H/cDQaAq91E5GenqKeujQM9ccAZT0lQ8OxiRo1RnUUTfz0wl9fxp3x6TKA43qT06MQf3oLE0nuUADiehmf9zUEraSwYlCcByXznDKSf2iWSyyvw6Fm9gNXn5V3Q2HXPlKUpXGZg49pT1VFy9SOsXPhKNcTZSpBKKuaLQvrSGh2QHdnbkjNMNe0bdE56zxT/tp9OhwXRGmXJpacocSHIuDGZmv+VBb/w6U4qMumB8zKOU00cMkakeUtT6DNwcAoKOipS0C8LPCbWe8L8QosMbRFgWT65gseW1POlHxi4o/uhSoVs/xmPS9J2GxtDd3Y2vf4F/lRKUdReMM7iU92Q5QBGUafF1NJz+Ez7jLkUwxmg9OBdwUxK2pyJPLNQ398YKMwwkwhfzIZVBRiAzbpds286WWOiTwMXa1i1Ei66bYXFmupp1OkuDcJYeb8gtrLkmx2t6bCgk8gsKlQrQZPdvPjqK0oBF5yZAHFTVycM4v7C15b+q1yYjqbBcsFsSxSvF3d+tZ8I/UZJFc7c70NQ== stg.fedoraproject.org +@cert-authority *.fedoraproject.org,*.iad2.fedoraproject.org,*.fedorainfracloud.org,fedorapeople.org,pagure.io,*.fedorainfracloud.org,*.aws.fedoraproject.org,*.cloud.fedoraproject.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCZDS6lxxFrx4c+voCOCwljEqBfqRrEIPQc+J7vCwiRptkFR2InBbvtsYZZElH6shR7YcHzWszNgFz1hAJO1z7AjA81li6esvKQfa4tfaI8Ryx8gHf8aXGjekioJ76T/CYQXHjOXHdKOkAQFMp7a3NmkyxTnt1027eBjSQ4pKnu+OCY5ujqp/hQOnTs67bNKHFljcF/Os7uBOM2EVgPFU/slJV321fBdw1fHFkzsu/AJDLr2RVUquZ6migYP0icEL8yRvriSi5Wbq9iGsoG+nrw5vNjD1TJxBfnMBxSVhzX3UgL5Ucg5Rl1Mx33olKTdSnFCLfWoYAdZs6m7I5/LXH+s2Qz4GobgxkKdWWQgZH+VjwUPgMJwyfkV1klWu9213fYnIiPVWHYIL5ESLHtOKjSaHy7SoEuv4WDq+KBwOFB6WO/v19YrgYJAHiJQ/By4AZyjdh3mVPPu4VeD1wuDUXtLbRjxJS7QodZrlr6BtjcQ/9l4xgbkX/RnpNAri8s/SMHaSCrpH9IsefV0owRkvadSGYBUp7VcBkiJ4zjMJwAfvFBrhVGN/C5nXbLIDYxsiKQP8Jp2KBAlprza7febpdDLglnVQqtjW9VgIUgcpYtrSi45ehJ7z1fpHTWW3Gz53e4s7v5znZ1iT/Nn+Cqzvw3yNtTbz706muEq6Y+EdYohQ== fedoraproject.org +@cert-authority *.qa.fedoraproject.org,pagure-stg01.fedoraproject.org,*.stg.fedoraproject.org,*.stg.iad2.fedoraproject.org,stg.pagure.io,*.aws.fedoraproject.org,*.fedorainfracloud.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDijAoR3tCmVi9yj0L4oaVfpHKIQoGYTVvSlXz6elL/X8YIbubVG6e0lhO3xadoD6wpi9+c1Zu3oc/WZAzx5/iuJD2m4cLgDdVt3CcAS4PyCW+YKI99pijlZlOHgBR/o3zU4PmERSViCYhGBYyBDlyiNg0H/cDQaAq91E5GenqKeujQM9ccAZT0lQ8OxiRo1RnUUTfz0wl9fxp3x6TKA43qT06MQf3oLE0nuUADiehmf9zUEraSwYlCcByXznDKSf2iWSyyvw6Fm9gNXn5V3Q2HXPlKUpXGZg49pT1VFy9SOsXPhKNcTZSpBKKuaLQvrSGh2QHdnbkjNMNe0bdE56zxT/tp9OhwXRGmXJpacocSHIuDGZmv+VBb/w6U4qMumB8zKOU00cMkakeUtT6DNwcAoKOipS0C8LPCbWe8L8QosMbRFgWT65gseW1POlHxi4o/uhSoVs/xmPS9J2GxtDd3Y2vf4F/lRKUdReMM7iU92Q5QBGUafF1NJz+Ez7jLkUwxmg9OBdwUxK2pyJPLNQ398YKMwwkwhfzIZVBRiAzbpds286WWOiTwMXa1i1Ei66bYXFmupp1OkuDcJYeb8gtrLkmx2t6bCgk8gsKlQrQZPdvPjqK0oBF5yZAHFTVycM4v7C15b+q1yYjqbBcsFsSxSvF3d+tZ8I/UZJFc7c70NQ== stg.fedoraproject.org diff --git a/roles/chrony/templates/chrony.conf.j2 b/roles/chrony/templates/chrony.conf.j2 index 15ac7f2db8..1cf50f5047 100644 --- a/roles/chrony/templates/chrony.conf.j2 +++ b/roles/chrony/templates/chrony.conf.j2 @@ -1,11 +1,7 @@ # setup our servers -{% if datacenter == 'phx2' and not ansible_hostname.startswith('bastion') %} -server bastion01.phx2.fedoraproject.org iburst -server bastion02.phx2.fedoraproject.org iburst -{% elif datacenter == 'iad2' and not ansible_hostname.startswith('bastion') %} +{% if datacenter == 'iad2' and not ansible_hostname.startswith('bastion') %} server bastion01.iad2.fedoraproject.org iburst server bastion02.iad2.fedoraproject.org iburst - {% elif datacenter == 'cloud' and not ansible_hostname.startswith('cloud-noc') %} server cloud-noc01.fedorainfracloud.org port 124 {% elif datacenter == 'cloud' and ansible_hostname.startswith('cloud-noc') %} @@ -42,7 +38,6 @@ minsources 1 {% if ansible_hostname.startswith('bastion') %} allow 10.0.0.0/8 {% elif ansible_hostname.startswith('cloud-noc') %} -allow 209.132.184.0/24 allow 38.145.48.0/23 {% endif %} diff --git a/roles/fedmsg/base/templates/endpoints-bodhi.py.j2 b/roles/fedmsg/base/templates/endpoints-bodhi.py.j2 index 962917a41f..6f98098fda 100644 --- a/roles/fedmsg/base/templates/endpoints-bodhi.py.j2 +++ b/roles/fedmsg/base/templates/endpoints-bodhi.py.j2 @@ -1,8 +1,8 @@ -{% if datacenter == 'phx2' %} +{% if datacenter == 'iad2' %} {% if env == 'staging' %} -suffix = 'stg.phx2.fedoraproject.org' +suffix = 'stg.iad2.fedoraproject.org' {% else %} -suffix = 'phx2.fedoraproject.org' +suffix = 'iad2.fedoraproject.org' vpn_suffix = 'vpn.fedoraproject.org' {% endif %} {% elif datacenter == 'iad2' %} diff --git a/roles/fedmsg/base/templates/endpoints-bugzilla2fedmsg.py.j2 b/roles/fedmsg/base/templates/endpoints-bugzilla2fedmsg.py.j2 index a865b43934..fb597f4c8b 100644 --- a/roles/fedmsg/base/templates/endpoints-bugzilla2fedmsg.py.j2 +++ b/roles/fedmsg/base/templates/endpoints-bugzilla2fedmsg.py.j2 @@ -1,8 +1,8 @@ -{% if datacenter == 'phx2' %} +{% if datacenter == 'iad2' %} {% if env == 'staging' %} -suffix = 'stg.phx2.fedoraproject.org' +suffix = 'stg.iad2.fedoraproject.org' {% else %} -suffix = 'phx2.fedoraproject.org' +suffix = 'iad2.fedoraproject.org' vpn_suffix = 'vpn.fedoraproject.org' {% endif %} {% elif datacenter == 'iad2' %} diff --git a/roles/fedmsg/base/templates/endpoints-fedbadges.py.j2 b/roles/fedmsg/base/templates/endpoints-fedbadges.py.j2 index d1c93e8c69..3bde2d3d82 100644 --- a/roles/fedmsg/base/templates/endpoints-fedbadges.py.j2 +++ b/roles/fedmsg/base/templates/endpoints-fedbadges.py.j2 @@ -1,8 +1,8 @@ -{% if datacenter == 'phx2' %} +{% if datacenter == 'iad2' %} {% if env == 'staging' %} -suffix = 'stg.phx2.fedoraproject.org' +suffix = 'stg.iad2.fedoraproject.org' {% else %} -suffix = 'phx2.fedoraproject.org' +suffix = 'iad2.fedoraproject.org' vpn_suffix = 'vpn.fedoraproject.org' {% endif %} {% elif datacenter == 'iad2' %} diff --git a/roles/fedmsg/base/templates/endpoints-fedimg.py.j2 b/roles/fedmsg/base/templates/endpoints-fedimg.py.j2 index 73b1b26a4e..0628698db7 100644 --- a/roles/fedmsg/base/templates/endpoints-fedimg.py.j2 +++ b/roles/fedmsg/base/templates/endpoints-fedimg.py.j2 @@ -1,7 +1,7 @@ {% if env == 'staging' %} -suffix = 'stg.phx2.fedoraproject.org' +suffix = 'stg.iad2.fedoraproject.org' {% else %} -suffix = 'phx2.fedoraproject.org' +suffix = 'iad2.fedoraproject.org' {% endif %} # REMEMBER -- if you change these, you need to also change the iptables rules in diff --git a/roles/fedmsg/base/templates/endpoints-fedocal.py.j2 b/roles/fedmsg/base/templates/endpoints-fedocal.py.j2 index 02c302414a..f08f709005 100644 --- a/roles/fedmsg/base/templates/endpoints-fedocal.py.j2 +++ b/roles/fedmsg/base/templates/endpoints-fedocal.py.j2 @@ -1,8 +1,8 @@ -{% if datacenter == 'phx2' %} +{% if datacenter == 'iad2' %} {% if env == 'staging' %} -suffix = 'stg.phx2.fedoraproject.org' +suffix = 'stg.iad2.fedoraproject.org' {% else %} -suffix = 'phx2.fedoraproject.org' +suffix = 'iad2.fedoraproject.org' vpn_suffix = 'vpn.fedoraproject.org' {% endif %} {% elif datacenter == 'iad2' %} diff --git a/roles/fedmsg/base/templates/endpoints-fmn-backend.py.j2 b/roles/fedmsg/base/templates/endpoints-fmn-backend.py.j2 index 4f4adcbffa..28207df1bd 100644 --- a/roles/fedmsg/base/templates/endpoints-fmn-backend.py.j2 +++ b/roles/fedmsg/base/templates/endpoints-fmn-backend.py.j2 @@ -1,7 +1,7 @@ {% if env == 'staging' %} -suffix = 'stg.phx2.fedoraproject.org' +suffix = 'stg.iad2.fedoraproject.org' {% else %} -suffix = 'phx2.fedoraproject.org' +suffix = 'iad2.fedoraproject.org' {% endif %} config = dict( diff --git a/roles/fedmsg/base/templates/endpoints-fmn-web.py.j2 b/roles/fedmsg/base/templates/endpoints-fmn-web.py.j2 index 0c3327343f..6c59b82a2c 100644 --- a/roles/fedmsg/base/templates/endpoints-fmn-web.py.j2 +++ b/roles/fedmsg/base/templates/endpoints-fmn-web.py.j2 @@ -1,8 +1,8 @@ -{% if datacenter == 'phx2' %} +{% if datacenter == 'iad2' %} {% if env == 'staging' %} -suffix = 'stg.phx2.fedoraproject.org' +suffix = 'stg.iad2.fedoraproject.org' {% else %} -suffix = 'phx2.fedoraproject.org' +suffix = 'iad2.fedoraproject.org' vpn_suffix = 'vpn.fedoraproject.org' {% endif %} {% elif datacenter == 'iad2' %} diff --git a/roles/fedmsg/base/templates/endpoints-hotness.py.j2 b/roles/fedmsg/base/templates/endpoints-hotness.py.j2 index 13d1e90f55..5865f7c184 100644 --- a/roles/fedmsg/base/templates/endpoints-hotness.py.j2 +++ b/roles/fedmsg/base/templates/endpoints-hotness.py.j2 @@ -1,8 +1,8 @@ -{% if datacenter == 'phx2' %} +{% if datacenter == 'iad2' %} {% if env == 'staging' %} -suffix = 'stg.phx2.fedoraproject.org' +suffix = 'stg.iad2.fedoraproject.org' {% else %} -suffix = 'phx2.fedoraproject.org' +suffix = 'iad2.fedoraproject.org' vpn_suffix = 'vpn.fedoraproject.org' {% endif %} {% elif datacenter == 'iad2' %} diff --git a/roles/fedmsg/base/templates/endpoints-mailman.py.j2 b/roles/fedmsg/base/templates/endpoints-mailman.py.j2 index 0846fc565c..0d7c39ce4b 100644 --- a/roles/fedmsg/base/templates/endpoints-mailman.py.j2 +++ b/roles/fedmsg/base/templates/endpoints-mailman.py.j2 @@ -1,8 +1,8 @@ -{% if datacenter == 'phx2' %} +{% if datacenter == 'iad2' %} {% if env == 'staging' %} -suffix = 'stg.phx2.fedoraproject.org' +suffix = 'stg.iad2.fedoraproject.org' {% else %} -suffix = 'phx2.fedoraproject.org' +suffix = 'iad2.fedoraproject.org' vpn_suffix = 'vpn.fedoraproject.org' {% endif %} {% elif datacenter == 'iad2' %} diff --git a/roles/fedmsg/base/templates/endpoints-mbs-backend.py.j2 b/roles/fedmsg/base/templates/endpoints-mbs-backend.py.j2 index 5de05a4f97..aa87c9aa91 100644 --- a/roles/fedmsg/base/templates/endpoints-mbs-backend.py.j2 +++ b/roles/fedmsg/base/templates/endpoints-mbs-backend.py.j2 @@ -1,8 +1,8 @@ -{% if datacenter == 'phx2' %} +{% if datacenter == 'iad2' %} {% if env == 'staging' %} -suffix = 'stg.phx2.fedoraproject.org' +suffix = 'stg.iad2.fedoraproject.org' {% else %} -suffix = 'phx2.fedoraproject.org' +suffix = 'iad2.fedoraproject.org' vpn_suffix = 'vpn.fedoraproject.org' {% endif %} {% elif datacenter == 'iad2' %} diff --git a/roles/fedmsg/base/templates/endpoints-odcs-backend.py.j2 b/roles/fedmsg/base/templates/endpoints-odcs-backend.py.j2 index b8aa339033..80d08a4450 100644 --- a/roles/fedmsg/base/templates/endpoints-odcs-backend.py.j2 +++ b/roles/fedmsg/base/templates/endpoints-odcs-backend.py.j2 @@ -1,8 +1,8 @@ -{% if datacenter == 'phx2' %} +{% if datacenter == 'iad2' %} {% if env == 'staging' %} -suffix = 'stg.phx2.fedoraproject.org' +suffix = 'stg.iad2.fedoraproject.org' {% else %} -suffix = 'phx2.fedoraproject.org' +suffix = 'iad2.fedoraproject.org' vpn_suffix = 'vpn.fedoraproject.org' {% endif %} {% elif datacenter == 'iad2' %} diff --git a/roles/fedmsg/base/templates/endpoints.py.j2 b/roles/fedmsg/base/templates/endpoints.py.j2 index b3e714b637..17ffed4686 100644 --- a/roles/fedmsg/base/templates/endpoints.py.j2 +++ b/roles/fedmsg/base/templates/endpoints.py.j2 @@ -1,8 +1,8 @@ -{% if datacenter == 'phx2' %} +{% if datacenter == 'iad2' %} {% if env == 'staging' %} -suffix = 'stg.phx2.fedoraproject.org' +suffix = 'stg.iad2.fedoraproject.org' {% else %} -suffix = 'phx2.fedoraproject.org' +suffix = 'iad2.fedoraproject.org' vpn_suffix = 'vpn.fedoraproject.org' {% endif %} {% elif datacenter == 'iad2' %} diff --git a/roles/fedmsg/base/templates/logging.py.j2 b/roles/fedmsg/base/templates/logging.py.j2 index 637cc2bde2..ca4fc59429 100644 --- a/roles/fedmsg/base/templates/logging.py.j2 +++ b/roles/fedmsg/base/templates/logging.py.j2 @@ -218,8 +218,8 @@ config = dict( "formatter": "hefty", "filters": ["context"], "level": "ERROR", -{% if datacenter == 'phx2' %} - "mailhost": "bastion.phx2.fedoraproject.org", +{% if datacenter == 'iad2' %} + "mailhost": "bastion.iad2.fedoraproject.org", {% elif datacenter == 'iad2' %} "mailhost": "bastion.iad2.fedoraproject.org", {% else %} diff --git a/roles/fedmsg/base/templates/relay.py.j2 b/roles/fedmsg/base/templates/relay.py.j2 index bd80bec580..61275ff69a 100644 --- a/roles/fedmsg/base/templates/relay.py.j2 +++ b/roles/fedmsg/base/templates/relay.py.j2 @@ -1,8 +1,8 @@ -{% if datacenter == 'phx2' %} +{% if datacenter == 'iad2' %} {% if env == 'staging' %} -suffix = 'stg.phx2.fedoraproject.org' +suffix = 'stg.iad2.fedoraproject.org' {% else %} -suffix = 'phx2.fedoraproject.org' +suffix = 'iad2.fedoraproject.org' vpn_suffix = 'vpn.fedoraproject.org' {% endif %} {% elif datacenter == 'iad2' %} @@ -40,7 +40,7 @@ config = dict( # php, can't maintain a single passive-bind endpoint of it's own. relay_inbound=[ - # Primarily, scripts from inside phx2 connect here. + # Primarily, scripts from inside iad2 connect here. # Furthermore, scripts from outside (coprs, secondary arch koji) connect # here via haproxy. "tcp://busgateway01.%s:9941" % suffix, diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.00-ipa.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.00-ipa.conf index d5f700df97..0333fc2af1 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.00-ipa.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.00-ipa.conf @@ -1,4 +1,4 @@ -ProxyPassReverseCookieDomain ipa01{{env_suffix}}.phx2.fedoraproject.org id{{env_suffix}}.fedoraproject.org +ProxyPassReverseCookieDomain ipa01{{env_suffix}}.iad2.fedoraproject.org id{{env_suffix}}.fedoraproject.org ProxyPass {{ localpath }} {{ proxyurl }}{{remotepath}} ProxyPassReverse {{ localpath }} {{ proxyurl }}{{remotepath}} diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.git.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.git.conf index d690eccc49..fb78621666 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.git.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.git.conf @@ -42,7 +42,7 @@ ProxyPreserveHost On Require valid-user -{% if datacenter == 'iad2' or datacenter == 'phx2' %} +{% if datacenter == 'iad2' %} ProxyPass {{ localpath }} {{ proxyurl }}{{remotepath}} ProxyPassReverse {{ localpath }} {{ proxyurl }}{{remotepath}} {% else %} diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.koji.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.koji.conf index eba84fef51..2724dc9e82 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.koji.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.koji.conf @@ -4,7 +4,7 @@ ProxyPreserveHost On ProxyTimeout 10800 TimeOut 10800 -{% if 'phx2' in inventory_hostname or 'iad2' in inventory_hostname %} +{% if 'iad2' in inventory_hostname %} {% include "reversepassproxy.conf" %} {% else %} Redirect 421 / diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.kojipkgs.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.kojipkgs.conf index 3702893d79..9304e364a0 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.kojipkgs.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.kojipkgs.conf @@ -31,7 +31,7 @@ ProxyPreserveHost On {% endif %} -{% if datacenter == 'iad2' or datacenter == 'phx2' %} +{% if datacenter == 'iad2' %} {% if balancer_name is defined %} diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.nagios.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.nagios.conf index bf19c1188c..78a8394ae1 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.nagios.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.nagios.conf @@ -1,4 +1,4 @@ -{% if datacenter == 'iad2' or datacenter == 'phx2' %} +{% if datacenter == 'iad2' %} ProxyPass {{ localpath }} {{ proxyurl }}{{remotepath}} ProxyPassReverse {{ localpath }} {{ proxyurl }}{{remotepath}} {% else %} diff --git a/roles/ipa/server/tasks/main.yml b/roles/ipa/server/tasks/main.yml index 6f1b8863ac..5cd4e89201 100644 --- a/roles/ipa/server/tasks/main.yml +++ b/roles/ipa/server/tasks/main.yml @@ -66,7 +66,7 @@ when: not ipa_initial - name: create replica file - delegate_to: ipa01.phx2.fedoraproject.org + delegate_to: ipa01.iad2.fedoraproject.org command: ipa-replica-prepare --password={{ipa_dm_password}} {{inventory_hostname}} @@ -77,7 +77,7 @@ when: not ipa_initial and ansible_distribution_major_version|int < 8 and not replication_status.stat.exists - name: retrieve replica file - delegate_to: ipa01.phx2.fedoraproject.org + delegate_to: ipa01.iad2.fedoraproject.org fetch: src=/var/lib/ipa/replica-info-{{inventory_hostname}}.gpg dest=/tmp/ipa_replica_{{inventory_hostname}}.gpg flat=yes @@ -141,7 +141,7 @@ --force-join --log-file=/var/log/ipainstall.log --domain={{ipa_realm}} - --server=ipa01.phx2.fedoraproject.org + --server=ipa01.iad2.fedoraproject.org creates=/etc/ipa/default.conf tags: - ipa/server diff --git a/roles/kerneltest/templates/kerneltest.cfg b/roles/kerneltest/templates/kerneltest.cfg index 73df0bafc5..bbae7d4a6c 100644 --- a/roles/kerneltest/templates/kerneltest.cfg +++ b/roles/kerneltest/templates/kerneltest.cfg @@ -6,12 +6,7 @@ SECRET_KEY='{{ kerneltest_secret_key }}' ### url to the database server: #DB_URL=mysql://user:pass@host/db_name #DB_URL=postgres://user:pass@host/db_name -{% if datacenter == 'phx2' %} -DB_URL='postgresql://{{ kerneltest_db_user }}:{{ kerneltest_db_pass }}@{{ kerneltest_db_host }}/{{ kerneltest_db_name }}' -{% elif datacenter == 'iad2' %} DB_URL='postgresql://{{ kerneltest_db_user }}:{{ kerneltest_db_pass }}@db01.iad2.fedoraproject.org/{{ kerneltest_db_name }}' -{% endif %} - # Specify where the logs of the tests should be stored LOG_DIR = '/var/www/logs' diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf index fae288e121..d6e352dfae 100644 --- a/roles/koji_builder/templates/kojid.conf +++ b/roles/koji_builder/templates/kojid.conf @@ -129,7 +129,7 @@ allowed_scms= build_arch_can_fail = true ; The mail host to use for sending email notifications -smtphost=bastion.phx2.fedoraproject.org +smtphost=bastion.iad2.fedoraproject.org ; The From address used when sending email notifications from_addr=Fedora Koji Build System diff --git a/roles/koji_hub/templates/koji-gc.conf.j2 b/roles/koji_hub/templates/koji-gc.conf.j2 index 130e66eaf8..9dc308bc47 100644 --- a/roles/koji_hub/templates/koji-gc.conf.j2 +++ b/roles/koji_hub/templates/koji-gc.conf.j2 @@ -8,7 +8,7 @@ principal=koji-gc/koji{{env_suffix}}.fedoraproject.org@{{ipa_realm}} ; The location of the keytab for the principal above keytab=/etc/krb5.koji-gc_koji{{env_suffix}}.fedoraproject.org.keytab krb_rdns = False -smtp_host = bastion.phx2.fedoraproject.org +smtp_host = bastion.iad2.fedoraproject.org key_aliases = 30C9ECF8 fedora-test diff --git a/roles/kojipkgs/files/squid.conf b/roles/kojipkgs/files/squid.conf deleted file mode 100644 index 9fb08a86ea..0000000000 --- a/roles/kojipkgs/files/squid.conf +++ /dev/null @@ -1,112 +0,0 @@ -http_port 80 accel defaultsite=kojipkgs.fedoraproject.org -https_port 443 accel defaultsite=kojipkgs.fedoraproject.org cert=/etc/pki/tls/certs/wildcard-2020.fedoraproject.org.combined.cert key=/etc/pki/tls/private/wildcard-2020.fedoraproject.org.key cipher=ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA:AES256-SHA:AES:CAMELLIA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA options=NO_SSLv2,NO_SSLv3 - -cache_peer 127.0.0.1 parent 8080 0 no-query originserver name=kojipkgs - -cache_swap_low 98 -cache_swap_high 99 -cache_mem 32 GB -maximum_object_size 200 MB -minimum_object_size 0 KB -cache_replacement_policy heap LFUDA -maximum_object_size_in_memory 100 MB -memory_replacement_policy heap LFUDA - -logformat squid %ts.%03tu %6tr %>a %Ss/%03Hs %a %Ss/%03Hs %h] [%a %ui %un [%tl] "%rm %ru HTTP/%rv" %Hs %a %ui %un [%tl] "%rm %ru HTTP/%rv" %Hs %h" "%{User-Agent}>h" %Ss:%Sh - -access_log /var/log/squid/access.log squid -cache_log /var/log/squid/cache.log -cache_store_log /var/log/squid/store.log - -refresh_pattern . 1440 100% 10080 - -# -# Define all our acls here. -# -acl all src all -acl apache rep_header Server ^Apache -acl cachemanager proto cache_object -acl localhost src 127.0.0.1/255.255.255.255 -acl to_localhost dst 127.0.0.0/8 -acl SSL_ports port 443 -acl Safe_ports port 80 # http -acl Safe_ports port 443 # https -acl CONNECT method CONNECT -acl our_sites dstdomain kojipkgs.fedoraproject.org kojipkgs01.fedoraproject.org kojipkgs02.fedoraproject.org kojipkgs01.iad2.fedoraproject.org kojipkgs02.iad2.fedoraproject.org -acl phx2 src 10.5.125.0/24 10.5.127.0/24 10.5.129.0/24 -# The stg builders in the createrepo channel need access to repos -acl phx2-stg src 10.5.128.84/32 10.5.128.85/32 10.5.128.86/32 10.5.128.87/32 10.5.128.69/32 -acl pdc src 10.5.126.134/32 -acl proxies src 10.5.126.51/32 10.5.126.52/32 ::1 -acl repo_url urlpath_regex -i ^/repo/ -acl kojipkgs urlpath_regex -i \.(rpm|log|sig)$ -acl mash urlpath_regex -i ^/mash/ -acl compose urlpath_regex -i ^/compose/ -acl nonredist urlpath_regex -i openh264 - -# -# Here is where we use the above acls -# - -# Allow phx2 and stg builders in the createrepo channel to repos dir and deny everyone else -http_access allow phx2 repo_url -http_access allow phx2-stg repo_url -http_access deny repo_url - -# Only allow cachemanager from localhost -http_access allow cachemanager localhost -http_access deny cachemanager - -# Let the pdc-backend inspect the composes -http_access allow pdc compose - -# Let the proxies access things -http_access allow proxies -follow_x_forwarded_for allow proxies - -# Do not allow non safe ports or connect on anything but ssl ports -http_access deny !Safe_ports -http_access deny CONNECT !SSL_ports - -# Allow our sites and localhost -http_access allow our_sites -http_access allow localhost -http_access deny all -http_reply_access allow all -icp_access allow all - -cache_peer_access kojipkgs allow our_sites -cache_peer_access kojipkgs deny all - -# Do not cache mash or compose data -cache deny mash -cache deny compose - -# Do not cache any non-redistributable content -# (this would cache the HIT for sign-bridge and then serve it to others) -cache deny nonredist - -# Do cache all rpms/log/sigs otherwise -cache allow kojipkgs -cache deny all - -coredump_dir /var/spool/squid - -# put the pid in the tmpdir with worker ipc sockets -pid_filename /var/run/squid/squid.pid - -# Run in smp mode with 8 workers -# smp mode seems to cause problems with partial downloads and hangs. -#workers 8 - -# In smp mode you have to specify per worker cache dirs -# Also you have to manually run squid -z -F -f /etc/squid/squid.conf -# to create these dirs. -#if ${process_number} = 9 -# # nothing -#else -# cache_dir ufs /var/spool/squid/${process_number} 10000 16 256 -#endif diff --git a/roles/mailman/tasks/main.yml b/roles/mailman/tasks/main.yml index 382f8b02e3..efb9f2b654 100644 --- a/roles/mailman/tasks/main.yml +++ b/roles/mailman/tasks/main.yml @@ -551,14 +551,14 @@ - postfix - webui-qcluster tags: mailman - when: inventory_hostname.startswith('mailman01.phx2') + when: inventory_hostname.startswith('mailman01.iad2') - name: enable one-shot services service: enabled=yes name={{ item }} with_items: - webui-warm-up-cache tags: mailman - when: inventory_hostname.startswith('mailman01.phx2') + when: inventory_hostname.startswith('mailman01.iad2') - name: Create /etc/pki/fedora-messaging file: diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2 index cb00b0c13f..654cb997c5 100644 --- a/roles/mediawiki/templates/LocalSettings.php.fp.j2 +++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2 @@ -449,12 +449,8 @@ $wgLogo = "https://fedoraproject.org/static/images/fedora-logo.png"; $wgGroupPermissions['Legal']['read'] = true; $wgGroupPermissions['Packaging']['read'] = true; -{% if datacenter == 'phx2' %} -require_once( "$IP/extensions/Lockdown/Lockdown.php" ); -{% else %} wfLoadExtension( 'Lockdown' ); $wgActorTableSchemaMigrationStage = MIGRATION_OLD; -{% endif %} $wgSpecialPageLockdown['Export'] = array('*'); diff --git a/roles/mirror_pagure_ansible/templates/mirror_pagure_ansible.cfg b/roles/mirror_pagure_ansible/templates/mirror_pagure_ansible.cfg index 09cd7f571c..8181e85f3e 100644 --- a/roles/mirror_pagure_ansible/templates/mirror_pagure_ansible.cfg +++ b/roles/mirror_pagure_ansible/templates/mirror_pagure_ansible.cfg @@ -9,10 +9,8 @@ callback = "mirror_from_pagure_bus:MirrorFromPagure" # topic_prefix = "" [[bindings]] -{% if inventory_hostname.startswith('batcave01.phx2') %} +{% if inventory_hostname.startswith('batcave01.iad2') %} queue = "mirror_pagure_ansible{{ env_suffix }}" -{% elif inventory_hostname.startswith('batcave01.iad2') %} -queue = "mirror_pagure_ansible{{ env_suffix }}_iad2" {% elif inventory_hostname.startswith('batcave13.') %} queue = "mirror_pagure_ansible{{ env_suffix }}_13" {% endif %} @@ -31,10 +29,8 @@ app = "mirror_from_pagure" app_url = "https://pagure.io/fedora-infra/mirror_from_pagure" app_contacts_email = ["pingou@fedoraproject.org"] -{% if inventory_hostname.startswith('batcave01.phx2') %} +{% if inventory_hostname.startswith('batcave01.iad2') %} [queues."mirror_pagure_ansible{{ env_suffix }}"] -{% elif inventory_hostname.startswith('batcave01.iad2') %} -[queues."mirror_pagure_ansible{{ env_suffix }}_iad2"] {% elif inventory_hostname.startswith('batcave13.') %} [queues."mirror_pagure_ansible{{ env_suffix }}_13"] {% endif %} diff --git a/roles/openshift-apps/coreos-cincinnati/templates/egresspolicy.yml b/roles/openshift-apps/coreos-cincinnati/templates/egresspolicy.yml index 55e004c65f..64edeec764 100644 --- a/roles/openshift-apps/coreos-cincinnati/templates/egresspolicy.yml +++ b/roles/openshift-apps/coreos-cincinnati/templates/egresspolicy.yml @@ -25,7 +25,7 @@ spec: dnsName: dl.fedoraproject.org - type: Allow to: - dnsName: dl.phx2.fedoraproject.org + dnsName: dl.iad2.fedoraproject.org - type: Allow to: cidrSelector: "0.0.0.0/0" diff --git a/roles/openshift-apps/greenwave/templates/greenwave.py b/roles/openshift-apps/greenwave/templates/greenwave.py index fba69caf90..723e8a0474 100644 --- a/roles/openshift-apps/greenwave/templates/greenwave.py +++ b/roles/openshift-apps/greenwave/templates/greenwave.py @@ -47,7 +47,7 @@ config = dict( {% if env == 'staging' %} environment='stg', - relay_inbound=["tcp://busgateway01.stg.phx2.fedoraproject.org:9941"], + relay_inbound=["tcp://busgateway01.stg.iad2.fedoraproject.org:9941"], greenwave_api_url='https://greenwave-web-greenwave.app.os.stg.fedoraproject.org/api/v1.0', # STG greenwave should listen to the STG bus. endpoints=dict( @@ -57,7 +57,7 @@ config = dict( ), {% else %} environment='prod', - relay_inbound=["tcp://busgateway01.phx2.fedoraproject.org:9941"], + relay_inbound=["tcp://busgateway01.iad2.fedoraproject.org:9941"], greenwave_api_url='https://greenwave-web-greenwave.app.os.fedoraproject.org/api/v1.0' {% endif %} ) diff --git a/roles/openshift-apps/mdapi/templates/mdapi.cfg b/roles/openshift-apps/mdapi/templates/mdapi.cfg index 27eb9768e3..bbb4397c42 100644 --- a/roles/openshift-apps/mdapi/templates/mdapi.cfg +++ b/roles/openshift-apps/mdapi/templates/mdapi.cfg @@ -3,8 +3,8 @@ PORT = '8080' DL_VERIFY = False {% if env == 'staging' %} KOJI_REPO = 'https://koji.stg.fedoraproject.org/repos/' -DL_SERVER = 'http://dl.phx2.fedoraproject.org' +DL_SERVER = 'http://dl.iad2.fedoraproject.org' {% else %} KOJI_REPO = 'https://koji.fedoraproject.org/repos/' -DL_SERVER = 'http://dl.phx2.fedoraproject.org' +DL_SERVER = 'http://dl.iad2.fedoraproject.org' {% endif %} diff --git a/roles/openshift-apps/waiverdb/templates/settings.py b/roles/openshift-apps/waiverdb/templates/settings.py index d06933bf5e..4aa6996a6e 100644 --- a/roles/openshift-apps/waiverdb/templates/settings.py +++ b/roles/openshift-apps/waiverdb/templates/settings.py @@ -5,8 +5,6 @@ CORS_URL = 'https://bodhi.stg.fedoraproject.org' {% else %} {% if datacenter == "iad2" %} DATABASE_URI = 'postgresql+psycopg2://waiverdb@db01.iad2.fedoraproject.org:5432/waiverdb' -{% else %} -DATABASE_URI = 'postgresql+psycopg2://waiverdb@db01.phx2.fedoraproject.org:5432/waiverdb' {% endif %} RESULTSDB_API_URL = 'https://taskotron.fedoraproject.org/resultsdb_api/api/v2.0' CORS_URL = 'https://bodhi.fedoraproject.org' diff --git a/roles/releng/files/fedmsg/endpoints.py b/roles/releng/files/fedmsg/endpoints.py index 5df570bb1d..997921c21c 100644 --- a/roles/releng/files/fedmsg/endpoints.py +++ b/roles/releng/files/fedmsg/endpoints.py @@ -1,4 +1,4 @@ -suffix = 'phx2.fedoraproject.org' +suffix = 'iad2.fedoraproject.org' non_phx_suffix = 'fedoraproject.org' config = dict( diff --git a/roles/rsyncd/files/rsyncd.conf.crawler b/roles/rsyncd/files/rsyncd.conf.crawler index d90be160c1..5079b10253 100644 --- a/roles/rsyncd/files/rsyncd.conf.crawler +++ b/roles/rsyncd/files/rsyncd.conf.crawler @@ -13,7 +13,7 @@ path = /var/log/mirrormanager/crawler uid = mirrormanager gid = mirrormanager read only = yes -hosts allow = mm-frontend01.phx2.fedoraproject.org mm-frontend02.phx2.fedoraproject.org 209.132.181.102 +hosts allow = mm-frontend01.iad2.fedoraproject.org mm-frontend02.iad2.fedoraproject.org 209.132.181.102 # For distributing propagation logs to the mm backend [propagation] @@ -22,4 +22,4 @@ path = /var/log/mirrormanager/propagation uid = mirrormanager gid = mirrormanager read only = yes -hosts allow = mm-backend01.phx2.fedoraproject.org +hosts allow = mm-backend01.iad2.fedoraproject.org diff --git a/roles/rsyncd/templates/rsyncd.conf.download.j2 b/roles/rsyncd/templates/rsyncd.conf.download.j2 index 6610dcaa81..59ea4982bf 100644 --- a/roles/rsyncd/templates/rsyncd.conf.download.j2 +++ b/roles/rsyncd/templates/rsyncd.conf.download.j2 @@ -146,7 +146,7 @@ refuse options = checksum gid = 263 hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %} -{% if datacenter == 'phx2' %} +{% if datacenter == 'iad2' %} [fedora-compose0] comment = Fedora composes path = /mnt/koji/compose diff --git a/roles/totpcgi/files/pam_url.conf b/roles/totpcgi/files/pam_url.conf index 9ce7690b81..4ba6808355 100644 --- a/roles/totpcgi/files/pam_url.conf +++ b/roles/totpcgi/files/pam_url.conf @@ -2,7 +2,7 @@ pam_url: { settings: { - url = "https://fas-all.phx2.fedoraproject.org:8443/"; # URI to fetch + url = "https://fas-all.iad2.fedoraproject.org:8443/"; # URI to fetch returncode = "OK"; # The remote script/cgi should return a 200 http code and this string as its only results userfield = "user"; # userfield name to send passwdfield = "token"; # passwdfield name to send diff --git a/roles/totpcgi/files/pam_url.conf.fakefas01 b/roles/totpcgi/files/pam_url.conf.fakefas01 index 9ce7690b81..4ba6808355 100644 --- a/roles/totpcgi/files/pam_url.conf.fakefas01 +++ b/roles/totpcgi/files/pam_url.conf.fakefas01 @@ -2,7 +2,7 @@ pam_url: { settings: { - url = "https://fas-all.phx2.fedoraproject.org:8443/"; # URI to fetch + url = "https://fas-all.iad2.fedoraproject.org:8443/"; # URI to fetch returncode = "OK"; # The remote script/cgi should return a 200 http code and this string as its only results userfield = "user"; # userfield name to send passwdfield = "token"; # passwdfield name to send diff --git a/roles/totpcgi/files/pam_url.conf.stg b/roles/totpcgi/files/pam_url.conf.stg index bc98d534b3..047ff5a90b 100644 --- a/roles/totpcgi/files/pam_url.conf.stg +++ b/roles/totpcgi/files/pam_url.conf.stg @@ -2,7 +2,7 @@ pam_url: { settings: { - url = "https://fas-all.stg.phx2.fedoraproject.org/"; # URI to fetch + url = "https://fas-all.stg.iad2.fedoraproject.org/"; # URI to fetch returncode = "OK"; # The remote script/cgi should return a 200 http code and this string as its only results userfield = "user"; # userfield name to send passwdfield = "token"; # passwdfield name to send diff --git a/roles/totpcgi/tasks/main.yml b/roles/totpcgi/tasks/main.yml index cedaf28938..6169dac7e5 100644 --- a/roles/totpcgi/tasks/main.yml +++ b/roles/totpcgi/tasks/main.yml @@ -92,7 +92,7 @@ - name: copy staging server cert file over copy: > - src={{ private }}/files/2fa-certs/keys/fas-all.stg.phx2.fedoraproject.org.crt + src={{ private }}/files/2fa-certs/keys/fas-all.stg.iad2.fedoraproject.org.crt dest=/etc/pki/tls/certs/totpcgi-server.crt owner=root group=totpcgi @@ -104,7 +104,7 @@ - name: copy staging server key file over copy: > - src={{ private }}/files/2fa-certs/keys/fas-all.stg.phx2.fedoraproject.org.key + src={{ private }}/files/2fa-certs/keys/fas-all.stg.iad2.fedoraproject.org.key dest=/etc/pki/totpcgi/totpcgi-server.key owner=root group=totpcgi @@ -131,7 +131,7 @@ - name: copy server cert file over copy: > - src={{ private }}/files/2fa-certs/keys/fas-all.phx2.fedoraproject.org.crt + src={{ private }}/files/2fa-certs/keys/fas-all.iad2.fedoraproject.org.crt dest=/etc/pki/totpcgi/totpcgi-server.crt owner=root group=totpcgi @@ -145,7 +145,7 @@ - name: copy server cert file over copy: > - src={{ private }}/files/2fa-certs/keys/fas-all.phx2.fedoraproject.org.key + src={{ private }}/files/2fa-certs/keys/fas-all.iad2.fedoraproject.org.key dest=/etc/pki/totpcgi/totpcgi-server.key owner=root group=totpcgi diff --git a/roles/totpcgi/templates/configmap.yml b/roles/totpcgi/templates/configmap.yml index bd44488add..f4375f80ae 100644 --- a/roles/totpcgi/templates/configmap.yml +++ b/roles/totpcgi/templates/configmap.yml @@ -102,11 +102,11 @@ data: {% if env == "staging" %} - ServerName fas-all.stg.phx2.fedoraproject.org:8443 + ServerName fas-all.stg.iad2.fedoraproject.org:8443 {% elif objectname == "configmap-totpcgi-vpn.yml" %} ServerName fas-all.vpn.fedoraproject.org:8443 -{% elif datacenter == 'phx2' %} - ServerName fas-all.phx2.fedoraproject.org:8443 +{% elif datacenter == 'iad2' %} + ServerName fas-all.iad2.fedoraproject.org:8443 {% elif datacenter == 'iad2' %} ServerName fas-all.iad2.fedoraproject.org:8443 {% endif %} diff --git a/roles/totpcgi/templates/provisioning-httpd.conf.j2 b/roles/totpcgi/templates/provisioning-httpd.conf.j2 index 102ee3255f..6b776fbb27 100644 --- a/roles/totpcgi/templates/provisioning-httpd.conf.j2 +++ b/roles/totpcgi/templates/provisioning-httpd.conf.j2 @@ -3,7 +3,7 @@ Listen 8444 LoadModule suexec_module modules/mod_suexec.so DocumentRoot /var/www/totpcgi-provisioning - ServerName fas01.stg.phx2.fedoraproject.org:8444 + ServerName fas01.stg.iad2.fedoraproject.org:8444 ErrorLog /var/log/httpd/totpcgi-provisioning-error.log SuexecUserGroup totpcgiprov totpcgiprov diff --git a/roles/totpcgi/templates/totpcgi-httpd.conf.j2 b/roles/totpcgi/templates/totpcgi-httpd.conf.j2 index e9fd6d546d..29cd380418 100644 --- a/roles/totpcgi/templates/totpcgi-httpd.conf.j2 +++ b/roles/totpcgi/templates/totpcgi-httpd.conf.j2 @@ -5,11 +5,7 @@ Listen 8443 ServerAdmin admin@fedoraproject.org DocumentRoot /var/www/totpcgi -{% if datacenter == 'phx2' %} - ServerName fas-all.phx2.fedoraproject.org:8443 -{% elif datacenter == 'iad2' %} ServerName fas-all.iad2.fedoraproject.org:8443 -{% endif %} ErrorLog /var/log/httpd/totpcgi-error.log SuexecUserGroup totpcgi totpcgi diff --git a/roles/totpcgi/templates/totpcgi-httpd.conf.stg.j2 b/roles/totpcgi/templates/totpcgi-httpd.conf.stg.j2 index 4bd0243d91..5424c8e3d0 100644 --- a/roles/totpcgi/templates/totpcgi-httpd.conf.stg.j2 +++ b/roles/totpcgi/templates/totpcgi-httpd.conf.stg.j2 @@ -5,7 +5,7 @@ Listen 8443 ServerAdmin admin@fedoraproject.org DocumentRoot /var/www/totpcgi - ServerName fas-all.stg.phx2.fedoraproject.org:8443 + ServerName fas-all.stg.iad2.fedoraproject.org:8443 ErrorLog /var/log/httpd/totpcgi-error.log SuexecUserGroup totpcgi totpcgi diff --git a/scripts/public-db-copy b/scripts/public-db-copy index fa7b4ff7e5..3dfbdb7b17 100755 --- a/scripts/public-db-copy +++ b/scripts/public-db-copy @@ -4,16 +4,16 @@ # A simple script to copy database dumps over to public space on batcave01 # Only the most recent dump is published # -scp db-datanommer02.phx2.fedoraproject.org:/backups/datanommer-$(date +%F).dump.xz /srv/web/infra/db-dumps/datanommer.dump.xz -scp db-koji02.phx2.fedoraproject.org:/backups/koji-$(date +%F).dump.xz /srv/web/infra/db-dumps/koji.dump.xz -scp db01.phx2.fedoraproject.org:/backups/pkgdb2-$(date +%F).dump.xz /srv/web/infra/db-dumps/pkgdb2.dump.xz -scp db01.phx2.fedoraproject.org:/backups/koschei-$(date +%F).dump.xz /srv/web/infra/db-dumps/koschei.dump.xz -scp db01.phx2.fedoraproject.org:/backups/bodhi2-$(date +%F).dump.xz /srv/web/infra/db-dumps/bodhi2.dump.xz -scp db01.phx2.fedoraproject.org:/backups/pdc-$(date +%F).dump.xz /srv/web/infra/db-dumps/pdc.dump.xz -scp db01.phx2.fedoraproject.org:/backups/anitya-public-$(date +%F).dump.xz /srv/web/infra/db-dumps/anitya.dump.xz -scp db01.phx2.fedoraproject.org:/backups/mailman-$(date +%F).dump.xz /srv/web/infra/db-dumps/mailman.dump.xz -scp db01.phx2.fedoraproject.org:/backups/mbs-$(date +%F).dump.xz /srv/web/infra/db-dumps/mbs.dump.xz -scp db01.phx2.fedoraproject.org:/backups/odcs-$(date +%F).dump.xz /srv/web/infra/db-dumps/odcs.dump.xz -scp db01.phx2.fedoraproject.org:/backups/hyperkitty-$(date +%F).dump.xz /srv/web/infra/db-dumps/hyperkitty.dump.xz -scp db-qa02.qa.fedoraproject.org:/backups/resultsdb-$(date +%F).dump.xz /srv/web/infra/db-dumps/resultsdb.dump.xz -scp db01.phx2.fedoraproject.org:/backups/waiverdb-$(date +%F).dump.xz /srv/web/infra/db-dumps/waiverdb.dump.xz +scp db-datanommer01.iad2.fedoraproject.org:/backups/datanommer-$(date +%F).dump.xz /srv/web/infra/db-dumps/datanommer.dump.xz +scp db-koji01.iad2.fedoraproject.org:/backups/koji-$(date +%F).dump.xz /srv/web/infra/db-dumps/koji.dump.xz +scp db01.iad2.fedoraproject.org:/backups/pkgdb2-$(date +%F).dump.xz /srv/web/infra/db-dumps/pkgdb2.dump.xz +scp db01.iad2.fedoraproject.org:/backups/koschei-$(date +%F).dump.xz /srv/web/infra/db-dumps/koschei.dump.xz +scp db01.iad2.fedoraproject.org:/backups/bodhi2-$(date +%F).dump.xz /srv/web/infra/db-dumps/bodhi2.dump.xz +scp db01.iad2.fedoraproject.org:/backups/pdc-$(date +%F).dump.xz /srv/web/infra/db-dumps/pdc.dump.xz +scp db01.iad2.fedoraproject.org:/backups/anitya-public-$(date +%F).dump.xz /srv/web/infra/db-dumps/anitya.dump.xz +scp db01.iad2.fedoraproject.org:/backups/mailman-$(date +%F).dump.xz /srv/web/infra/db-dumps/mailman.dump.xz +scp db01.iad2.fedoraproject.org:/backups/mbs-$(date +%F).dump.xz /srv/web/infra/db-dumps/mbs.dump.xz +scp db01.iad2.fedoraproject.org:/backups/odcs-$(date +%F).dump.xz /srv/web/infra/db-dumps/odcs.dump.xz +scp db01.iad2.fedoraproject.org:/backups/hyperkitty-$(date +%F).dump.xz /srv/web/infra/db-dumps/hyperkitty.dump.xz +scp db01.iad2.fedoraproject.org:/backups/resultsdb-$(date +%F).dump.xz /srv/web/infra/db-dumps/resultsdb.dump.xz +scp db01.iad2.fedoraproject.org:/backups/waiverdb-$(date +%F).dump.xz /srv/web/infra/db-dumps/waiverdb.dump.xz