diff --git a/files/osbs/fix-docker-iptables.staging b/files/osbs/fix-docker-iptables.staging index 75675631e0..f04c26c7c4 100644 --- a/files/osbs/fix-docker-iptables.staging +++ b/files/osbs/fix-docker-iptables.staging @@ -33,7 +33,8 @@ iptables -A FILTER_FORWARD --src 10.1.0.0/16 --dst 10.1.0.0/16 -j ACCEPT iptables -A FILTER_FORWARD -p tcp -m tcp -d 10.5.126.88 --dport 443 -j ACCEPT # docker-registry -iptables -A FILTER_FORWARD -p tcp -m tcp -d 10.5.126.217 --dport 443 -j ACCEPT +iptables -A FILTER_FORWARD -p tcp -m tcp -d 10.5.128.123 --dport 443 -j ACCEPT +iptables -A FILTER_FORWARD -p tcp -m tcp -d 10.5.128.124 --dport 443 -j ACCEPT #koji.fp.o iptables -A FILTER_FORWARD -p tcp -m tcp -d 10.5.126.87 --dport 80 -j ACCEPT diff --git a/inventory/group_vars/basset-stg b/inventory/group_vars/basset-stg index 0a00100889..34b7f70419 100644 --- a/inventory/group_vars/basset-stg +++ b/inventory/group_vars/basset-stg @@ -6,7 +6,6 @@ num_cpus: 2 custom_rules: [ # fas01.stg - '-A INPUT -p tcp -m tcp -s 10.5.126.86 --dport 80 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.5.128.129 --dport 80 -j ACCEPT', # wiki01.stg '-A INPUT -p tcp -m tcp -s 10.5.128.188 --dport 80 -j ACCEPT', diff --git a/inventory/host_vars/autocloud-web02.stg.phx2.fedoraproject.org b/inventory/host_vars/autocloud-web02.stg.phx2.fedoraproject.org index c6d8f433c1..ddbd707000 100644 --- a/inventory/host_vars/autocloud-web02.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/autocloud-web02.stg.phx2.fedoraproject.org @@ -1,12 +1,12 @@ --- nm: 255.255.255.0 -gw: 10.5.126.254 +gw: 10.5.128.254 dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-25 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/25/Server/x86_64/os/ -eth0_ip: 10.5.126.89 +eth0_ip: 10.5.128.67 volgroup: /dev/vg_guests vmhost: virthost11.phx2.fedoraproject.org diff --git a/inventory/host_vars/bodhi-backend01.stg.phx2.fedoraproject.org b/inventory/host_vars/bodhi-backend01.stg.phx2.fedoraproject.org index 0391d92ce2..323c222a28 100644 --- a/inventory/host_vars/bodhi-backend01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/bodhi-backend01.stg.phx2.fedoraproject.org @@ -1,11 +1,11 @@ --- nm: 255.255.255.0 -gw: 10.5.126.254 +gw: 10.5.128.254 dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-25 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/25/Server/x86_64/os/ volgroup: /dev/vg_guests virt_install_command: "{{ virt_install_command_two_nic }}" -eth0_ip: 10.5.126.90 +eth0_ip: 10.5.128.79 eth1_ip: 10.5.127.65 vmhost: virthost12.phx2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-01.stg.phx2.fedoraproject.org b/inventory/host_vars/buildvm-01.stg.phx2.fedoraproject.org index cabfd5db9e..a458007591 100644 --- a/inventory/host_vars/buildvm-01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-01.stg.phx2.fedoraproject.org @@ -1,3 +1,4 @@ --- vmhost: virthost04.phx2.fedoraproject.org -eth0_ip: 10.5.126.14 +eth0_ip: 10.5.128.84 +gw: 10.5.128.254 diff --git a/inventory/host_vars/buildvm-02.stg.phx2.fedoraproject.org b/inventory/host_vars/buildvm-02.stg.phx2.fedoraproject.org index 8e1a852b23..2712a4348d 100644 --- a/inventory/host_vars/buildvm-02.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-02.stg.phx2.fedoraproject.org @@ -1,3 +1,4 @@ --- vmhost: virthost04.phx2.fedoraproject.org -eth0_ip: 10.5.126.223 +eth0_ip: 10.5.128.85 +gw: 10.5.128.254 diff --git a/inventory/host_vars/buildvm-03.stg.phx2.fedoraproject.org b/inventory/host_vars/buildvm-03.stg.phx2.fedoraproject.org index 74398ac0e5..a6865a5a67 100644 --- a/inventory/host_vars/buildvm-03.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-03.stg.phx2.fedoraproject.org @@ -1,3 +1,4 @@ --- vmhost: virthost04.phx2.fedoraproject.org -eth0_ip: 10.5.126.224 +eth0_ip: 10.5.128.86 +gw: 10.5.128.254 diff --git a/inventory/host_vars/buildvm-04.stg.phx2.fedoraproject.org b/inventory/host_vars/buildvm-04.stg.phx2.fedoraproject.org index 43f8e3ca9a..5c0be89672 100644 --- a/inventory/host_vars/buildvm-04.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-04.stg.phx2.fedoraproject.org @@ -1,3 +1,4 @@ --- vmhost: virthost04.phx2.fedoraproject.org -eth0_ip: 10.5.126.225 +eth0_ip: 10.5.128.87 +gw: 10.5.128.254 diff --git a/inventory/host_vars/buildvm-05.stg.phx2.fedoraproject.org b/inventory/host_vars/buildvm-05.stg.phx2.fedoraproject.org index 4d1a0873e8..1e3e1247d2 100644 --- a/inventory/host_vars/buildvm-05.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-05.stg.phx2.fedoraproject.org @@ -1,3 +1,4 @@ --- vmhost: virthost04.phx2.fedoraproject.org -eth0_ip: 10.5.126.226 +eth0_ip: 10.5.128.69 +gw: 10.5.128.254 diff --git a/inventory/host_vars/db-fas01.stg.phx2.fedoraproject.org b/inventory/host_vars/db-fas01.stg.phx2.fedoraproject.org index e6bb33ca21..62b91bb2a3 100644 --- a/inventory/host_vars/db-fas01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/db-fas01.stg.phx2.fedoraproject.org @@ -29,7 +29,6 @@ fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-veteran # fas3-01.stg # custom_rules: -- '-A INPUT -p tcp -m tcp -s 10.5.126.86 --dport 5432 -j ACCEPT' - '-A INPUT -p tcp -m tcp -s 10.5.128.129 --dport 5432 -j ACCEPT' - '-A INPUT -p tcp -m tcp -s 10.5.126.35 --dport 5432 -j ACCEPT' - '-A INPUT -p tcp -m tcp -s 10.5.126.28 --dport 5432 -j ACCEPT' diff --git a/inventory/host_vars/db-koji01.stg.phx2.fedoraproject.org b/inventory/host_vars/db-koji01.stg.phx2.fedoraproject.org index 4141fb60fa..887369e427 100644 --- a/inventory/host_vars/db-koji01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/db-koji01.stg.phx2.fedoraproject.org @@ -1,9 +1,9 @@ --- nm: 255.255.255.0 -gw: 10.5.126.254 +gw: 10.5.128.254 dns: 10.5.126.21 volgroup: /dev/vg_guests -eth0_ip: 10.5.126.188 +eth0_ip: 10.5.128.98 vmhost: virthost04.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/db-koji02.stg.phx2.fedoraproject.org b/inventory/host_vars/db-koji02.stg.phx2.fedoraproject.org index 07e863bd1d..718e0ed648 100644 --- a/inventory/host_vars/db-koji02.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/db-koji02.stg.phx2.fedoraproject.org @@ -1,9 +1,9 @@ --- nm: 255.255.255.0 -gw: 10.5.126.254 +gw: 10.5.128.254 dns: 10.5.126.21 volgroup: /dev/vg_guests -eth0_ip: 10.5.126.189 +eth0_ip: 10.5.128.99 vmhost: virthost11.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/db03.stg.phx2.fedoraproject.org b/inventory/host_vars/db03.stg.phx2.fedoraproject.org index 344260c540..a7cd9ba202 100644 --- a/inventory/host_vars/db03.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/db03.stg.phx2.fedoraproject.org @@ -1,11 +1,11 @@ --- nm: 255.255.255.0 -gw: 10.5.126.254 +gw: 10.5.128.254 dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests -eth0_ip: 10.5.126.113 +eth0_ip: 10.5.128.95 vmhost: virthost11.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/elections01.stg.phx2.fedoraproject.org b/inventory/host_vars/elections01.stg.phx2.fedoraproject.org index d768358473..f0ca4b7ee2 100644 --- a/inventory/host_vars/elections01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/elections01.stg.phx2.fedoraproject.org @@ -1,12 +1,12 @@ --- nm: 255.255.255.0 -gw: 10.5.126.254 +gw: 10.5.128.254 dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests -eth0_ip: 10.5.126.105 +eth0_ip: 10.5.128.125 vmhost: virthost11.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/fedimg01.stg.phx2.fedoraproject.org b/inventory/host_vars/fedimg01.stg.phx2.fedoraproject.org index 1604633258..ff7ee0ffda 100644 --- a/inventory/host_vars/fedimg01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/fedimg01.stg.phx2.fedoraproject.org @@ -1,6 +1,6 @@ --- nm: 255.255.255.0 -gw: 10.5.126.254 +gw: 10.5.128.254 dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ @@ -9,4 +9,4 @@ datacenter: phx2 volgroup: /dev/vg_guests vmhost: virthost11.phx2.fedoraproject.org -eth0_ip: 10.5.126.9 +eth0_ip: 10.5.128.131 diff --git a/inventory/host_vars/fedocal01.stg.phx2.fedoraproject.org b/inventory/host_vars/fedocal01.stg.phx2.fedoraproject.org index 601b0afd8d..a5acba5002 100644 --- a/inventory/host_vars/fedocal01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/fedocal01.stg.phx2.fedoraproject.org @@ -1,12 +1,12 @@ --- nm: 255.255.255.0 -gw: 10.5.126.254 +gw: 10.5.128.254 dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests -eth0_ip: 10.5.126.66 +eth0_ip: 10.5.128.132 vmhost: virthost11.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/ipsilon01.stg.phx2.fedoraproject.org b/inventory/host_vars/ipsilon01.stg.phx2.fedoraproject.org index 713c8d9c25..d94dbffaed 100644 --- a/inventory/host_vars/ipsilon01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/ipsilon01.stg.phx2.fedoraproject.org @@ -1,12 +1,12 @@ --- nm: 255.255.255.0 -gw: 10.5.126.254 +gw: 10.5.128.254 dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests -eth0_ip: 10.5.126.35 +eth0_ip: 10.5.128.137 vmhost: virthost11.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/koschei-backend01.stg.phx2.fedoraproject.org b/inventory/host_vars/koschei-backend01.stg.phx2.fedoraproject.org index ea1a9612db..9e2c97f323 100644 --- a/inventory/host_vars/koschei-backend01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/koschei-backend01.stg.phx2.fedoraproject.org @@ -1,12 +1,12 @@ --- nm: 255.255.255.0 -gw: 10.5.126.254 +gw: 10.5.128.254 dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/26/Server/x86_64/os/ volgroup: /dev/vg_guests -eth0_ip: 10.5.126.227 +eth0_ip: 10.5.128.140 vmhost: virthost11.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/koschei-web01.stg.phx2.fedoraproject.org b/inventory/host_vars/koschei-web01.stg.phx2.fedoraproject.org index 85d5770ffa..4cdb2885fc 100644 --- a/inventory/host_vars/koschei-web01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/koschei-web01.stg.phx2.fedoraproject.org @@ -1,6 +1,6 @@ --- nm: 255.255.255.0 -gw: 10.5.126.254 +gw: 10.5.128.254 dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 @@ -8,6 +8,6 @@ ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests -eth0_ip: 10.5.126.228 +eth0_ip: 10.5.128.141 vmhost: virthost11.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/loopabull01.stg.phx2.fedoraproject.org b/inventory/host_vars/loopabull01.stg.phx2.fedoraproject.org index a5003a1639..172328d37f 100644 --- a/inventory/host_vars/loopabull01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/loopabull01.stg.phx2.fedoraproject.org @@ -1,7 +1,7 @@ --- -eth0_ip: 10.5.126.229 +eth0_ip: 10.5.128.142 nm: 255.255.255.0 -gw: 10.5.126.254 +gw: 10.5.128.254 dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ diff --git a/inventory/host_vars/mailman01.stg.phx2.fedoraproject.org b/inventory/host_vars/mailman01.stg.phx2.fedoraproject.org index 5dbd28cf2d..066c46e387 100644 --- a/inventory/host_vars/mailman01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/mailman01.stg.phx2.fedoraproject.org @@ -1,10 +1,10 @@ --- nm: 255.255.255.0 -gw: 10.5.126.254 +gw: 10.5.128.254 dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests -eth0_ip: 10.5.126.58 +eth0_ip: 10.5.128.143 vmhost: virthost11.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/mdapi01.stg.phx2.fedoraproject.org b/inventory/host_vars/mdapi01.stg.phx2.fedoraproject.org index 43caf88afe..df88ed1900 100644 --- a/inventory/host_vars/mdapi01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/mdapi01.stg.phx2.fedoraproject.org @@ -1,12 +1,12 @@ --- nm: 255.255.255.0 -gw: 10.5.126.254 +gw: 10.5.128.254 dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-25 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/25/Server/x86_64/os/ volgroup: /dev/vg_guests -eth0_ip: 10.5.126.206 +eth0_ip: 10.5.128.147 vmhost: virthost11.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/memcached01.stg.phx2.fedoraproject.org b/inventory/host_vars/memcached01.stg.phx2.fedoraproject.org index 350a56efd9..1249f7071c 100644 --- a/inventory/host_vars/memcached01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/memcached01.stg.phx2.fedoraproject.org @@ -1,6 +1,6 @@ --- nm: 255.255.255.0 -gw: 10.5.126.254 +gw: 10.5.128.254 dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 @@ -9,4 +9,4 @@ volgroup: /dev/vg_guests vmhost: virthost11.phx2.fedoraproject.org datacenter: phx2 -eth0_ip: 10.5.126.210 +eth0_ip: 10.5.128.148 diff --git a/inventory/host_vars/mm-crawler01.stg.phx2.fedoraproject.org b/inventory/host_vars/mm-crawler01.stg.phx2.fedoraproject.org index 29a6e6a99d..8ffc8d1850 100644 --- a/inventory/host_vars/mm-crawler01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/mm-crawler01.stg.phx2.fedoraproject.org @@ -4,11 +4,11 @@ mem_size: 32768 max_mem_size: 32768 num_cpus: 4 nm: 255.255.255.0 -gw: 10.5.126.254 +gw: 10.5.128.254 dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests -eth0_ip: 10.5.126.181 +eth0_ip: 10.5.128.151 vmhost: virthost11.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/modernpaste01.stg.phx2.fedoraproject.org b/inventory/host_vars/modernpaste01.stg.phx2.fedoraproject.org index 19d691384e..00314a8fa3 100644 --- a/inventory/host_vars/modernpaste01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/modernpaste01.stg.phx2.fedoraproject.org @@ -1,6 +1,6 @@ --- nm: 255.255.255.0 -gw: 10.5.126.254 +gw: 10.5.128.254 dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-25 @@ -8,7 +8,7 @@ ks_repo: http://10.5.126.23/pub/fedora/linux/releases/25/Server/x86_64/os/ mem_size: 2048 volgroup: /dev/vg_guests -eth0_ip: 10.5.126.221 +eth0_ip: 10.5.128.153 vmhost: virthost11.phx2.fedoraproject.org datacenter: phx2 tcp_ports: [22, 80, 443] diff --git a/inventory/host_vars/noc01.stg.phx2.fedoraproject.org b/inventory/host_vars/noc01.stg.phx2.fedoraproject.org index 62fdf36764..85de88c7f0 100644 --- a/inventory/host_vars/noc01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/noc01.stg.phx2.fedoraproject.org @@ -1,6 +1,6 @@ --- nm: 255.255.255.0 -gw: 10.5.126.254 +gw: 10.5.128.254 dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 @@ -17,7 +17,7 @@ custom_rules: [ '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT', ] -eth0_ip: 10.5.126.2 +eth0_ip: 10.5.128.38 csi_relationship: | noc01.stg is the internal monitoring nagios instance to the phx datacenter. diff --git a/inventory/host_vars/nuancier01.stg.phx2.fedoraproject.org b/inventory/host_vars/nuancier01.stg.phx2.fedoraproject.org index 431a35a610..783b9eec4f 100644 --- a/inventory/host_vars/nuancier01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/nuancier01.stg.phx2.fedoraproject.org @@ -1,12 +1,12 @@ --- nm: 255.255.255.0 -gw: 10.5.126.254 +gw: 10.5.128.254 dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests -eth0_ip: 10.5.126.202 +eth0_ip: 10.5.128.158 vmhost: virthost11.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/osbs-control01.stg.phx2.fedoraproject.org b/inventory/host_vars/osbs-control01.stg.phx2.fedoraproject.org index 0df5f2d053..57092d8298 100644 --- a/inventory/host_vars/osbs-control01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/osbs-control01.stg.phx2.fedoraproject.org @@ -1,12 +1,12 @@ --- nm: 255.255.255.0 -gw: 10.5.126.254 +gw: 10.5.128.254 dns: 10.5.126.21 +eth0_ip: 10.5.128.160 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.200 vmhost: virthost04.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/pdc-backend03.stg.phx2.fedoraproject.org b/inventory/host_vars/pdc-backend03.stg.phx2.fedoraproject.org index 5f26262602..0c3a2d1b4a 100644 --- a/inventory/host_vars/pdc-backend03.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/pdc-backend03.stg.phx2.fedoraproject.org @@ -1,12 +1,12 @@ --- nm: 255.255.255.0 -gw: 10.5.126.254 +gw: 10.5.128.254 dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ -eth0_ip: 10.5.126.243 +eth0_ip: 10.5.128.169 volgroup: /dev/vg_guests vmhost: virthost11.phx2.fedoraproject.org diff --git a/inventory/host_vars/sundries01.stg.phx2.fedoraproject.org b/inventory/host_vars/sundries01.stg.phx2.fedoraproject.org index 3e1f2c187b..50f8f331b8 100644 --- a/inventory/host_vars/sundries01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/sundries01.stg.phx2.fedoraproject.org @@ -1,11 +1,11 @@ --- nm: 255.255.255.0 -gw: 10.5.126.254 +gw: 10.5.128.254 dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests -eth0_ip: 10.5.126.24 +eth0_ip: 10.5.128.185 vmhost: virthost11.phx2.fedoraproject.org datacenter: phx2 # This overrides a group var and lets the playbook know that we should diff --git a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org index 67ad0e5050..aa28b5fd47 100644 --- a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org +++ b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org @@ -148,14 +148,6 @@ subnet 10.5.126.0 netmask 255.255.255.0 { option host-name "download05"; } - host temp-install03 { - hardware ethernet ac:f2:c5:ed:87:10; - fixed-address 10.5.126.167; - option host-name "temp-install03.phx2.fedoraproject.org"; - filename "pxelinux.0"; - next-server 10.5.126.41; - } - host data-analysis01 { hardware ethernet 5c:f3:fc:4b:d5:6c; fixed-address 10.5.126.121; diff --git a/roles/hosts/files/arm01-builder22.arm.fedoraproject.org-hosts b/roles/hosts/files/arm01-builder22.arm.fedoraproject.org-hosts index 0bebc8305d..8f38d693fd 100644 --- a/roles/hosts/files/arm01-builder22.arm.fedoraproject.org-hosts +++ b/roles/hosts/files/arm01-builder22.arm.fedoraproject.org-hosts @@ -6,9 +6,8 @@ 209.132.181.16 admin.fedoraproject.org 10.5.126.88 proxy01.phx2.fedoraproject.org proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org -10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 -10.5.126.85 db02.stg.fedoraproject.org -10.5.126.113 db05 +10.5.128.148 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 +10.5.128.95 db05 10.5.128.120 db01.stg.phx2.fedoraproject.org db-ask db-elections db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir db-notifs nuancier_db db-kerneltest 10.5.128.129 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all 10.5.126.83 pkgs.fedoraproject.org diff --git a/roles/hosts/files/arm01-builder23.arm.fedoraproject.org-hosts b/roles/hosts/files/arm01-builder23.arm.fedoraproject.org-hosts index 4cf5273738..57b318a6ac 100644 --- a/roles/hosts/files/arm01-builder23.arm.fedoraproject.org-hosts +++ b/roles/hosts/files/arm01-builder23.arm.fedoraproject.org-hosts @@ -6,9 +6,8 @@ 209.132.181.16 admin.fedoraproject.org 10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org -10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 -10.5.126.85 db02.stg.fedoraproject.org -10.5.126.113 db05 +10.5.128.148 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 +10.5.128.95 db05 10.5.128.120 db01.stg.phx2.fedoraproject.org db-ask db-elections db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir db-notifs nuancier_db db-kerneltest 10.5.128.129 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all 10.5.126.83 pkgs.fedoraproject.org pkgs.stg.fedoraproject.org pkgs01.stg.phx2.fedoraproject.org diff --git a/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts index 82b430ad10..39a2b45551 100644 --- a/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts @@ -6,8 +6,7 @@ 209.132.181.16 admin.fedoraproject.org 10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org -10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 -10.5.126.85 db02.stg.fedoraproject.org -10.5.126.113 db05 +10.5.128.148 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 +10.5.128.95 db05 10.5.128.120 db01.stg.phx2.fedoraproject.org db-ask db-elections db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir db-notifs nuancier_db db-kerneltest 10.5.126.83 pkgs.fedoraproject.org diff --git a/roles/hosts/files/buildvm-02.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/buildvm-02.stg.phx2.fedoraproject.org-hosts index 6d79e3188e..efb3636a66 100644 --- a/roles/hosts/files/buildvm-02.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/buildvm-02.stg.phx2.fedoraproject.org-hosts @@ -6,9 +6,8 @@ 209.132.181.16 admin.fedoraproject.org 10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org -10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 -10.5.126.85 db02.stg.fedoraproject.org -10.5.126.113 db05 +10.5.128.148 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 +10.5.128.95 db05 10.5.128.120 db01.stg.phx2.fedoraproject.org db-ask db-elections db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir db-notifs nuancier_db db-kerneltest 10.5.128.129 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all 10.5.126.83 pkgs.fedoraproject.org diff --git a/roles/hosts/files/buildvm-03.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/buildvm-03.stg.phx2.fedoraproject.org-hosts index edf612ffdc..205d1f5606 100644 --- a/roles/hosts/files/buildvm-03.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/buildvm-03.stg.phx2.fedoraproject.org-hosts @@ -6,9 +6,8 @@ 209.132.181.16 admin.fedoraproject.org 10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org -10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 -10.5.126.85 db02.stg.fedoraproject.org -10.5.126.113 db05 +10.5.128.148 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 +10.5.128.95 db05 10.5.128.120 db01.stg.phx2.fedoraproject.org db-ask db-elections db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir db-notifs nuancier_db db-kerneltest 10.5.128.129 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all 10.5.126.83 pkgs.fedoraproject.org diff --git a/roles/hosts/files/buildvm-04.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/buildvm-04.stg.phx2.fedoraproject.org-hosts index 6d79e3188e..efb3636a66 100644 --- a/roles/hosts/files/buildvm-04.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/buildvm-04.stg.phx2.fedoraproject.org-hosts @@ -6,9 +6,8 @@ 209.132.181.16 admin.fedoraproject.org 10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org -10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 -10.5.126.85 db02.stg.fedoraproject.org -10.5.126.113 db05 +10.5.128.148 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 +10.5.128.95 db05 10.5.128.120 db01.stg.phx2.fedoraproject.org db-ask db-elections db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir db-notifs nuancier_db db-kerneltest 10.5.128.129 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all 10.5.126.83 pkgs.fedoraproject.org diff --git a/roles/hosts/files/buildvm-05.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/buildvm-05.stg.phx2.fedoraproject.org-hosts index 6d79e3188e..efb3636a66 100644 --- a/roles/hosts/files/buildvm-05.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/buildvm-05.stg.phx2.fedoraproject.org-hosts @@ -6,9 +6,8 @@ 209.132.181.16 admin.fedoraproject.org 10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org -10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 -10.5.126.85 db02.stg.fedoraproject.org -10.5.126.113 db05 +10.5.128.148 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 +10.5.128.95 db05 10.5.128.120 db01.stg.phx2.fedoraproject.org db-ask db-elections db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir db-notifs nuancier_db db-kerneltest 10.5.128.129 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all 10.5.126.83 pkgs.fedoraproject.org diff --git a/roles/hosts/files/composer.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/composer.stg.phx2.fedoraproject.org-hosts index 1b78720432..940cfb1a28 100644 --- a/roles/hosts/files/composer.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/composer.stg.phx2.fedoraproject.org-hosts @@ -4,8 +4,7 @@ 10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.83 pkgs.fedoraproject.org -10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 -10.5.126.85 db02.stg.fedoraproject.org -10.5.126.113 db05 +10.5.128.148 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 +10.5.128.95 db05 10.5.128.120 db01.stg.phx2.fedoraproject.org db-ask db-elections db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir db-notifs nuancier_db db-blockerbugs db-kerneltest 10.5.128.129 fas01.stg.phx2.fedoraproject.org fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all diff --git a/roles/hosts/files/darkserver-backend01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/darkserver-backend01.stg.phx2.fedoraproject.org-hosts index a0891fe141..2f11fd0136 100644 --- a/roles/hosts/files/darkserver-backend01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/darkserver-backend01.stg.phx2.fedoraproject.org-hosts @@ -4,8 +4,7 @@ 10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org apps.fedoraproject.org apps.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.83 pkgs.fedoraproject.org -10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 -10.5.126.85 db02.stg.fedoraproject.org -10.5.126.113 db05 +10.5.128.148 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 +10.5.128.95 db05 10.5.128.120 db01.stg.phx2.fedoraproject.org db-ask db-elections db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir nuancier_db db-notifs db-blockerbugs db-kerneltest 10.5.128.129 fas01.stg.phx2.fedoraproject.org fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all diff --git a/roles/hosts/files/db-koji01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/db-koji01.stg.phx2.fedoraproject.org-hosts index 1d4cd50898..274b2380ef 100644 --- a/roles/hosts/files/db-koji01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/db-koji01.stg.phx2.fedoraproject.org-hosts @@ -4,8 +4,7 @@ 10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org apps.fedoraproject.org apps.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.83 pkgs.fedoraproject.org -10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 -10.5.126.85 db02.stg.fedoraproject.org -10.5.126.113 db05 +10.5.128.148 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 +10.5.128.95 db05 10.5.128.120 db01.stg.phx2.fedoraproject.org db-ask db-elections db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir nuancier_db db-notifs db-blockerbugs db-kerneltest db-pps 10.5.128.129 fas01.stg.phx2.fedoraproject.org fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all diff --git a/roles/hosts/files/db-koji02.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/db-koji02.stg.phx2.fedoraproject.org-hosts index e23a440da3..c805f7a307 100644 --- a/roles/hosts/files/db-koji02.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/db-koji02.stg.phx2.fedoraproject.org-hosts @@ -4,8 +4,7 @@ 10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org apps.fedoraproject.org apps.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.83 pkgs.fedoraproject.org -10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 -10.5.126.85 db02.stg.fedoraproject.org -10.5.126.113 db05 +10.5.128.148 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 +10.5.128.95 db05 10.5.128.120 db01.stg.phx2.fedoraproject.org db-ask db-elections db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir nuancier_db db-notifs db-blockerbugs db-kerneltest db-pps 10.5.128.129 fas01.stg.phx2.fedoraproject.org fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all diff --git a/roles/hosts/files/fedimg01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/fedimg01.stg.phx2.fedoraproject.org-hosts index 429ce3682d..9b0e2736c5 100644 --- a/roles/hosts/files/fedimg01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/fedimg01.stg.phx2.fedoraproject.org-hosts @@ -4,8 +4,7 @@ 10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org -10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 -10.5.126.85 db02.stg.fedoraproject.org -10.5.126.113 db05 +10.5.128.148 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 +10.5.128.95 db05 10.5.128.120 db01.stg.phx2.fedoraproject.org db-ask db-elections db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir db-notifs nuancier_db db-kerneltest 10.5.128.129 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all diff --git a/roles/hosts/files/hotness01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/hotness01.stg.phx2.fedoraproject.org-hosts index b4993889be..93c1535987 100644 --- a/roles/hosts/files/hotness01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/hotness01.stg.phx2.fedoraproject.org-hosts @@ -4,8 +4,7 @@ 10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org -10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 -10.5.126.85 db02.stg.fedoraproject.org -10.5.126.113 db05 +10.5.128.148 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 +10.5.128.95 db05 10.5.128.120 db01.stg.phx2.fedoraproject.org db-ask db-elections db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir db-notifs nuancier_db db-kerneltest 10.5.128.129 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all diff --git a/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts index c9e654b7a0..858962a189 100644 --- a/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts @@ -1,6 +1,5 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.85 db02.stg.fedoraproject.org -10.5.126.113 db05 +10.5.128.95 db05 10.5.128.120 db01.stg.phx2.fedoraproject.org db-ask db-elections db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir db-notifs nuancier_db db-kerneltest diff --git a/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts index 477ae60b1b..826c734d51 100644 --- a/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts @@ -5,13 +5,10 @@ 10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org 10.5.126.83 pkgs.fedoraproject.org pkgs pkgs01 10.5.126.81 app01.phx2.fedoraproject.org app1 app3 app5 bapp1 app01 app03 app05 bapp01 bapp02 -10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 -10.5.126.91 value03.phx2.fedoraproject.org value3 value03 +10.5.128.148 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 +10.5.128.187 value03.phx2.fedoraproject.org value3 value03 10.5.125.119 nfs01.phx2.fedoraproject.org nfs01 nfs1 -10.5.126.92 noc01.phx2.fedoraproject.org noc1 noc01 -10.5.126.82 app02.phx2.fedoraproject.org app2 app4 app02 app04 -10.5.126.85 db02.stg.phx2.fedoraproject.org db02 -10.5.126.113 db05 +10.5.128.95 db05 10.5.128.120 db01.stg.phx2.fedoraproject.org db-koji01 10.5.126.23 lockbox01.phx2.fedoraproject.org infrastructure.fedoraproject.org 10.5.126.87 koji.fedoraproject.org koji.stg.fedoraproject.org koji1 koji01 s390.koji.fedoraproject.org sparc.koji.fedoraproject.org arm.koji.fedoraproject.org ppc.koji.fedoraproject.org diff --git a/roles/hosts/files/proxy01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/proxy01.stg.phx2.fedoraproject.org-hosts index fd902fad1e..44b6e8ddd9 100644 --- a/roles/hosts/files/proxy01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/proxy01.stg.phx2.fedoraproject.org-hosts @@ -2,4 +2,4 @@ ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 # NOTE: This actually points to sundries01.stg for now. -10.5.126.24 app01.stg.fedoraproject.org bapp02 +10.5.128.185 app01.stg.fedoraproject.org bapp02 diff --git a/roles/hosts/files/staging-hosts b/roles/hosts/files/staging-hosts index 9ac8e7f84f..02c2b6836f 100644 --- a/roles/hosts/files/staging-hosts +++ b/roles/hosts/files/staging-hosts @@ -4,8 +4,7 @@ 10.5.126.88 proxy01.phx2.fedoraproject.org proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org apps.fedoraproject.org apps.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.83 pkgs.fedoraproject.org -10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 -10.5.126.85 db02.stg.fedoraproject.org -10.5.126.113 db05 +10.5.128.148 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 +10.5.128.95 db05 10.5.128.120 db01.stg.phx2.fedoraproject.org db-ask db-koji01 db-github2fedmsg tagger_db db-pkgdb2 db-summershum nuancier_db db-notifs db-kerneltest db-pps 10.5.128.129 fas01.stg.phx2.fedoraproject.org fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all diff --git a/roles/hosts/files/statscache-backend01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/statscache-backend01.stg.phx2.fedoraproject.org-hosts index 0cfb7d16f1..5a194888e3 100644 --- a/roles/hosts/files/statscache-backend01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/statscache-backend01.stg.phx2.fedoraproject.org-hosts @@ -5,9 +5,8 @@ 10.5.126.51 apps.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.83 pkgs.fedoraproject.org -10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 -10.5.126.85 db02.stg.fedoraproject.org -10.5.126.113 db05 +10.5.128.148 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 +10.5.128.95 db05 10.5.128.120 db01.stg.phx2.fedoraproject.org db-ask db-elections db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir nuancier_db db-notifs db-blockerbugs db-kerneltest 10.5.128.129 fas01.stg.phx2.fedoraproject.org fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all 10.5.126.87 koji01.stg.phx2.fedoraproject.org koji.stg.fedoraproject.org koji01 kojipkgs kojipkgs.stg.phx2.fedoraproject.org kojipkgs.stg.fedoraproject.org diff --git a/roles/hosts/files/sundries01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/sundries01.stg.phx2.fedoraproject.org-hosts index 87737238ae..40d8f98371 100644 --- a/roles/hosts/files/sundries01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/sundries01.stg.phx2.fedoraproject.org-hosts @@ -4,9 +4,8 @@ 10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org apps.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.83 pkgs.fedoraproject.org -10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 -10.5.126.85 db02.stg.fedoraproject.org -10.5.126.113 db05 +10.5.128.148 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 +10.5.128.95 db05 10.5.128.120 db01.stg.phx2.fedoraproject.org db-ask db-elections db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir nuancier_db db-notifs db-blockerbugs db-kerneltest 10.5.128.129 fas01.stg.phx2.fedoraproject.org fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all 10.5.126.87 koji01.stg.phx2.fedoraproject.org koji.stg.fedoraproject.org koji01 kojipkgs.stg.phx2.fedoraproject.org kojipkgs.stg.fedoraproject.org diff --git a/roles/kojipkgs/files/squid.conf b/roles/kojipkgs/files/squid.conf index e03e3f083b..3cf8f77b3a 100644 --- a/roles/kojipkgs/files/squid.conf +++ b/roles/kojipkgs/files/squid.conf @@ -38,7 +38,7 @@ acl CONNECT method CONNECT acl our_sites dstdomain kojipkgs.fedoraproject.org kojipkgs01.fedoraproject.org kojipkgs02.fedoraproject.org kojipkgs01.phx2.fedoraproject.org kojipkgs02.phx2.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.126.14/32 10.5.126.223/32 10.5.126.224/32 10.5.126.225/32 10.5.126.226/32 +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/ diff --git a/roles/nfs/server/files/koji01.stg.phx2.fedoraproject.org-exports b/roles/nfs/server/files/koji01.stg.phx2.fedoraproject.org-exports index ea84852c0d..47bed9d630 100644 --- a/roles/nfs/server/files/koji01.stg.phx2.fedoraproject.org-exports +++ b/roles/nfs/server/files/koji01.stg.phx2.fedoraproject.org-exports @@ -1 +1 @@ -/mnt/fedora_koji 10.5.126.90(rw,no_root_squash) 10.5.126.14(rw,no_root_squash) 10.5.126.6(rw,no_root_squash) 10.5.126.169(ro) 10.5.126.223(rw,no_root_squash) 10.5.126.224(rw,no_root_squash) 10.5.126.225(rw,no_root_squash) 10.5.126.226(rw,no_root_squash) 10.5.78.32(rw,no_root_squash) 10.5.78.33(rw,no_root_squash) 10.5.129.230(rw,no_root_squash) 10.5.129.231(rw,no_root_squash) 10.5.129.232(rw,no_root_squash) 10.5.129.233(rw,no_root_squash) +/mnt/fedora_koji 10.5.128.79(rw,no_root_squash) 10.5.128.84(rw,no_root_squash) 10.5.128.89(rw,no_root_squash) 10.5.128.81(ro) 10.5.128.85(rw,no_root_squash) 10.5.128.86(rw,no_root_squash) 10.5.128.87(rw,no_root_squash) 10.5.128.69(rw,no_root_squash) 10.5.78.32(rw,no_root_squash) 10.5.78.33(rw,no_root_squash) 10.5.129.230(rw,no_root_squash) 10.5.129.231(rw,no_root_squash) 10.5.129.232(rw,no_root_squash) 10.5.129.233(rw,no_root_squash) diff --git a/roles/postgresql_server_bdr/templates/pg_hba.conf b/roles/postgresql_server_bdr/templates/pg_hba.conf index ce524486bd..597e6160da 100644 --- a/roles/postgresql_server_bdr/templates/pg_hba.conf +++ b/roles/postgresql_server_bdr/templates/pg_hba.conf @@ -77,9 +77,9 @@ host all all 0.0.0.0 0.0.0.0 md5 # only fakefas needs it so far host all all ::1/128 md5 host all all 10.5.126.188/32 trust -host all all 10.5.126.189/32 trust +host all all 10.5.128.99/32 trust host replication all 10.5.126.188/32 trust -host replication all 10.5.126.189/32 trust +host replication all 10.5.128.99/32 trust # staging replication hosts {% for host in groups['pgbdr-stg']|sort %} {% if 'eth0_ip' in hostvars[host] %}# {{ host }} diff --git a/roles/varnish/templates/kojipkgs.vcl.j2 b/roles/varnish/templates/kojipkgs.vcl.j2 index de27070a8a..56b19efcf8 100644 --- a/roles/varnish/templates/kojipkgs.vcl.j2 +++ b/roles/varnish/templates/kojipkgs.vcl.j2 @@ -10,11 +10,11 @@ acl repoallowed { "10.5.125.0"/24; "10.5.127.0"/24; "10.5.129.0"/24; - "10.5.126.14"/32; - "10.5.126.223"/32; - "10.5.126.224"/32; - "10.5.126.225"/32; - "10.5.126.226"/32; + "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; "10.16.0.0"/24; }