diff --git a/inventory/group_vars/all b/inventory/group_vars/all index cf11127f50..85146c9020 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -34,6 +34,13 @@ mem_size: 2048 num_cpus: 2 lvm_size: 20000 +# Default netmask. Almost all our phx2 nets are /24's with the +# exception of 10.5.124.128/25. Almost all of our non phx2 sites are +# less than a /24. +eth0_nm: 255.255.255.0 +eth1_nm: 255.255.255.0 +br0_nm: 255.255.255.0 +br1_nm: 255.255.255.0 # # The default virt-install works for rhel7 or fedora with 1 nic # diff --git a/inventory/host_vars/anitya-backend01.fedoraproject.org b/inventory/host_vars/anitya-backend01.fedoraproject.org index 6ab9f27883..7ccf746b9c 100644 --- a/inventory/host_vars/anitya-backend01.fedoraproject.org +++ b/inventory/host_vars/anitya-backend01.fedoraproject.org @@ -6,6 +6,7 @@ dns: 8.8.8.8 volgroup: /dev/vg_guests eth0_ip: 140.211.169.230 +eth0_nm: 255.2555.255.128 ansible_ssh_host: anitya-backend01.fedoraproject.org fedmsg_fqdn: anitya-backend01.vpn.fedoraproject.org diff --git a/inventory/host_vars/anitya-frontend01.fedoraproject.org b/inventory/host_vars/anitya-frontend01.fedoraproject.org index be9cc6ca3e..844158fb58 100644 --- a/inventory/host_vars/anitya-frontend01.fedoraproject.org +++ b/inventory/host_vars/anitya-frontend01.fedoraproject.org @@ -8,6 +8,7 @@ ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests eth0_ip: 140.211.169.229 +eth0_nm: 255.255.255.128 ansible_ssh_host: anitya-frontend01.fedoraproject.org fedmsg_fqdn: anitya-frontend01.vpn.fedoraproject.org diff --git a/inventory/host_vars/bastion-comm01.qa.fedoraproject.org b/inventory/host_vars/bastion-comm01.qa.fedoraproject.org index 843564153a..02130f7021 100644 --- a/inventory/host_vars/bastion-comm01.qa.fedoraproject.org +++ b/inventory/host_vars/bastion-comm01.qa.fedoraproject.org @@ -7,6 +7,7 @@ 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 diff --git a/inventory/host_vars/beaker-stg01.qa.fedoraproject.org b/inventory/host_vars/beaker-stg01.qa.fedoraproject.org index 386ec1d204..b9659fc467 100644 --- a/inventory/host_vars/beaker-stg01.qa.fedoraproject.org +++ b/inventory/host_vars/beaker-stg01.qa.fedoraproject.org @@ -6,6 +6,7 @@ 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.141 +eth0_nm: 255.255.255.128 vmhost: virthost-comm04.qa.fedoraproject.org datacenter: phx2 fas_client_groups: sysadmin-qa,sysadmin-main diff --git a/inventory/host_vars/beaker01.qa.fedoraproject.org b/inventory/host_vars/beaker01.qa.fedoraproject.org index 9e14770848..0a9d96744f 100644 --- a/inventory/host_vars/beaker01.qa.fedoraproject.org +++ b/inventory/host_vars/beaker01.qa.fedoraproject.org @@ -6,5 +6,6 @@ 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_guests eth0_ip: 10.5.124.228 +eth0_nm: 255.255.255.128 vmhost: virthost-comm04.qa.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/buildvm-ppc64-02.qa.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-02.qa.fedoraproject.org index 436ffa6b13..8d9c277aee 100644 --- a/inventory/host_vars/buildvm-ppc64-02.qa.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64-02.qa.fedoraproject.org @@ -1,3 +1,4 @@ --- vmhost: ppc8-02.qa.fedoraproject.org eth0_ip: 10.5.124.225 +eth0_nm: 255.255.255.128 diff --git a/inventory/host_vars/buildvm-ppc64-03.qa.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-03.qa.fedoraproject.org index 41f9c625fc..0d1f6eb423 100644 --- a/inventory/host_vars/buildvm-ppc64-03.qa.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64-03.qa.fedoraproject.org @@ -1,3 +1,4 @@ --- vmhost: ppc8-03.qa.fedoraproject.org eth0_ip: 10.5.124.201 +eth0_nm: 255.255.255.128 diff --git a/inventory/host_vars/buildvm-ppc64-04.qa.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-04.qa.fedoraproject.org index 475b2bda7b..2a0ef40fef 100644 --- a/inventory/host_vars/buildvm-ppc64-04.qa.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64-04.qa.fedoraproject.org @@ -1,3 +1,4 @@ --- vmhost: ppc8-04.qa.fedoraproject.org eth0_ip: 10.5.124.235 +eth0_nm: 255.255.255.128 diff --git a/inventory/host_vars/buildvm-ppc64-06.qa.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-06.qa.fedoraproject.org index d52fd6b27c..8877bb0a60 100644 --- a/inventory/host_vars/buildvm-ppc64-06.qa.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64-06.qa.fedoraproject.org @@ -1,3 +1,4 @@ --- vmhost: ppc8-02.qa.fedoraproject.org eth0_ip: 10.5.124.226 +eth0_nm: 255.255.255.128 diff --git a/inventory/host_vars/buildvm-ppc64-07.qa.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-07.qa.fedoraproject.org index 275c13a262..33be80a5c0 100644 --- a/inventory/host_vars/buildvm-ppc64-07.qa.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64-07.qa.fedoraproject.org @@ -1,3 +1,4 @@ --- vmhost: ppc8-03.qa.fedoraproject.org eth0_ip: 10.5.124.142 +eth0_nm: 255.255.255.128 diff --git a/inventory/host_vars/buildvm-ppc64-08.qa.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-08.qa.fedoraproject.org index c1eb932c48..41d5466b13 100644 --- a/inventory/host_vars/buildvm-ppc64-08.qa.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64-08.qa.fedoraproject.org @@ -1,3 +1,4 @@ --- vmhost: ppc8-04.qa.fedoraproject.org eth0_ip: 10.5.124.133 +eth0_nm: 255.255.255.128 diff --git a/inventory/host_vars/buildvm-ppc64le-02.qa.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-02.qa.fedoraproject.org index 0a92e63195..9a3281591b 100644 --- a/inventory/host_vars/buildvm-ppc64le-02.qa.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-02.qa.fedoraproject.org @@ -1,3 +1,4 @@ --- vmhost: ppc8-02.qa.fedoraproject.org eth0_ip: 10.5.124.227 +eth0_nm: 255.255.255.128 diff --git a/inventory/host_vars/buildvm-ppc64le-03.qa.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-03.qa.fedoraproject.org index a78ebb144e..bd3adbc6a3 100644 --- a/inventory/host_vars/buildvm-ppc64le-03.qa.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-03.qa.fedoraproject.org @@ -1,3 +1,4 @@ --- vmhost: ppc8-03.qa.fedoraproject.org eth0_ip: 10.5.124.216 +eth0_nm: 255.255.255.128 diff --git a/inventory/host_vars/buildvm-ppc64le-04.qa.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-04.qa.fedoraproject.org index d41257807c..d5417c036c 100644 --- a/inventory/host_vars/buildvm-ppc64le-04.qa.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-04.qa.fedoraproject.org @@ -1,3 +1,4 @@ --- vmhost: ppc8-04.qa.fedoraproject.org eth0_ip: 10.5.124.223 +eth0_nm: 255.255.255.128 diff --git a/inventory/host_vars/buildvm-ppc64le-06.qa.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-06.qa.fedoraproject.org index 31f5812ae4..4e74abcce7 100644 --- a/inventory/host_vars/buildvm-ppc64le-06.qa.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-06.qa.fedoraproject.org @@ -1,3 +1,4 @@ --- vmhost: ppc8-02.qa.fedoraproject.org eth0_ip: 10.5.124.233 +eth0_nm: 255.255.255.128 diff --git a/inventory/host_vars/buildvm-ppc64le-07.qa.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-07.qa.fedoraproject.org index 8232b8555f..4a3760754e 100644 --- a/inventory/host_vars/buildvm-ppc64le-07.qa.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-07.qa.fedoraproject.org @@ -1,3 +1,4 @@ --- vmhost: ppc8-03.qa.fedoraproject.org eth0_ip: 10.5.124.224 +eth0_nm: 255.255.255.128 diff --git a/inventory/host_vars/buildvm-ppc64le-08.qa.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-08.qa.fedoraproject.org index f16bc68b6c..a23fb0d8e4 100644 --- a/inventory/host_vars/buildvm-ppc64le-08.qa.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-08.qa.fedoraproject.org @@ -1,3 +1,4 @@ --- vmhost: ppc8-04.qa.fedoraproject.org eth0_ip: 10.5.124.242 +eth0_nm: 255.255.255.128 diff --git a/inventory/host_vars/coloamer01.fedoraproject.org b/inventory/host_vars/coloamer01.fedoraproject.org index 2e16f2825b..93e9aa8342 100644 --- a/inventory/host_vars/coloamer01.fedoraproject.org +++ b/inventory/host_vars/coloamer01.fedoraproject.org @@ -2,3 +2,8 @@ datacenter: coloamer virthost: true postfix_group: vpn +br0_ip: 67.203.2.66 +br0_nm: 255.255.255.248 +has_ipv6: true +br0_ipv6: 2607:f188::21e:c9ff:fe42:836d +br0_ipv6_gw: 2607:f188:: diff --git a/inventory/host_vars/db-qa01.qa.fedoraproject.org b/inventory/host_vars/db-qa01.qa.fedoraproject.org index 73466672d3..a0c8899c13 100644 --- a/inventory/host_vars/db-qa01.qa.fedoraproject.org +++ b/inventory/host_vars/db-qa01.qa.fedoraproject.org @@ -6,6 +6,7 @@ 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.144 +eth0_nm: 255.255.255.128 vmhost: virthost-comm02.qa.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/dedicatedsolutions01.fedoraproject.org b/inventory/host_vars/dedicatedsolutions01.fedoraproject.org index 4d9af3cc11..12a42bb2a3 100644 --- a/inventory/host_vars/dedicatedsolutions01.fedoraproject.org +++ b/inventory/host_vars/dedicatedsolutions01.fedoraproject.org @@ -5,3 +5,8 @@ nrpe_procs_warn: 900 nrpe_procs_crit: 1000 postfix_group: vpn +br0_ip: 67.219.144.66 +br0_nm: 255.255.255.248 +has_ipv6: yes +br0_ipv6: 2604:1580:fe00:0:dead:beef:cafe:fe01 +br0_ipv6_gw: 2604:1580:fe00::1 diff --git a/inventory/host_vars/download-ib02.fedoraproject.org b/inventory/host_vars/download-ib02.fedoraproject.org index 6637e10991..8407efa087 100644 --- a/inventory/host_vars/download-ib02.fedoraproject.org +++ b/inventory/host_vars/download-ib02.fedoraproject.org @@ -6,6 +6,7 @@ ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7 ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_ibiblio04 eth0_ip: 152.19.134.195 +eth0_nm: 255.255.255.128 vmhost: ibiblio04.fedoraproject.org datacenter: ibiblio postfix_group: vpn diff --git a/inventory/host_vars/fakefas01.fedoraproject.org b/inventory/host_vars/fakefas01.fedoraproject.org deleted file mode 100644 index 3d8f2c30da..0000000000 --- a/inventory/host_vars/fakefas01.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ ---- -freezes: false diff --git a/inventory/host_vars/host1plus01.fedoraproject.org b/inventory/host_vars/host1plus01.fedoraproject.org index 2898b970bc..79a31a2665 100644 --- a/inventory/host_vars/host1plus01.fedoraproject.org +++ b/inventory/host_vars/host1plus01.fedoraproject.org @@ -3,3 +3,8 @@ datacenter: host1plus virthost: true nrpe_procs_warn: 900 nrpe_procs_crit: 1000 +br0_ip: 5.175.150.48 +br0_nm: 255.255.255.240 +has_ipv6: true +br0_ipv6: 2a00:d1a0:1::130 +br0_ipv6_gw: 2a00:d1a0:1::1 diff --git a/inventory/host_vars/hosted01.fedoraproject.org b/inventory/host_vars/hosted01.fedoraproject.org index b8975bcca3..abca0b6ebd 100644 --- a/inventory/host_vars/hosted01.fedoraproject.org +++ b/inventory/host_vars/hosted01.fedoraproject.org @@ -9,6 +9,7 @@ ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests eth0_ip: 140.211.169.207 +eth0_gw: 255.255.255.128 vmhost: osuosl03.fedoraproject.org datacenter: osuosl diff --git a/inventory/host_vars/ibiblio02.fedoraproject.org b/inventory/host_vars/ibiblio02.fedoraproject.org index 8588fcd634..f3bfb0bcb7 100644 --- a/inventory/host_vars/ibiblio02.fedoraproject.org +++ b/inventory/host_vars/ibiblio02.fedoraproject.org @@ -6,5 +6,6 @@ nm: 255.255.255.0 gw: 152.19.134.129 fas_client_groups: sysadmin-main dns: 8.8.8.8 -eth0_ip: 152.19.134.138 +br0_ip: 152.19.134.138 +br0_nm: 255.255.255.128 freezes: true diff --git a/inventory/host_vars/ibiblio03.fedoraproject.org b/inventory/host_vars/ibiblio03.fedoraproject.org index c81416a178..f120ba7b62 100644 --- a/inventory/host_vars/ibiblio03.fedoraproject.org +++ b/inventory/host_vars/ibiblio03.fedoraproject.org @@ -5,3 +5,5 @@ datacenter: ibiblio nm: 255.255.255.128 gw: 152.19.134.129 dns: 152.2.21.1 +br0_ip: 152.19.134.172 +br0_nm: 255.255.255.128 diff --git a/inventory/host_vars/ibiblio04.fedoraproject.org b/inventory/host_vars/ibiblio04.fedoraproject.org index c81416a178..bf2248a09c 100644 --- a/inventory/host_vars/ibiblio04.fedoraproject.org +++ b/inventory/host_vars/ibiblio04.fedoraproject.org @@ -5,3 +5,5 @@ datacenter: ibiblio nm: 255.255.255.128 gw: 152.19.134.129 dns: 152.2.21.1 +br0_ip: 152.19.134.136 +br0_nm: 255.255.255.128 diff --git a/inventory/host_vars/ibiblio05.fedoraproject.org b/inventory/host_vars/ibiblio05.fedoraproject.org index c81416a178..bc9f65377e 100644 --- a/inventory/host_vars/ibiblio05.fedoraproject.org +++ b/inventory/host_vars/ibiblio05.fedoraproject.org @@ -5,3 +5,5 @@ datacenter: ibiblio nm: 255.255.255.128 gw: 152.19.134.129 dns: 152.2.21.1 +br0_ip: 152.19.134.137 +br0_nm: 255.255.255.128 diff --git a/inventory/host_vars/infinote.fedoraproject.org b/inventory/host_vars/infinote.fedoraproject.org index 77b854edcf..76ff82e873 100644 --- a/inventory/host_vars/infinote.fedoraproject.org +++ b/inventory/host_vars/infinote.fedoraproject.org @@ -6,6 +6,7 @@ dns: 8.8.8.8 volgroup: /dev/vg_guests eth0_ip: 140.211.169.231 +eth0_nm: 255.255.255.128 ansible_ssh_host: infinote.fedoraproject.org postfix_group: vpn diff --git a/inventory/host_vars/keys02.fedoraproject.org b/inventory/host_vars/keys02.fedoraproject.org index ee799e7b5c..1f67cf481e 100644 --- a/inventory/host_vars/keys02.fedoraproject.org +++ b/inventory/host_vars/keys02.fedoraproject.org @@ -6,5 +6,6 @@ ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7 ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests eth0_ip: 140.211.169.202 +eth0_nm: 255.255.255.128 vmhost: osuosl03.fedoraproject.org datacenter: osuosl diff --git a/inventory/host_vars/mirrorlist-dedicatedsolutions.fedoraproject.org b/inventory/host_vars/mirrorlist-dedicatedsolutions.fedoraproject.org index aa129fb17b..02573cf3fc 100644 --- a/inventory/host_vars/mirrorlist-dedicatedsolutions.fedoraproject.org +++ b/inventory/host_vars/mirrorlist-dedicatedsolutions.fedoraproject.org @@ -6,5 +6,8 @@ ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_virthost eth0_ip: 67.219.144.67 +has_ipv6: yes +eth0_ipv6: 2604:1580:fe00:0:5054:ff:fe3d:2b37 +eth0_ipv6_gw: 2604:1580:fe00::1 vmhost: dedicatedsolutions01.fedoraproject.org datacenter: dedicatedsolutions diff --git a/inventory/host_vars/mirrorlist-host1plus.fedoraproject.org b/inventory/host_vars/mirrorlist-host1plus.fedoraproject.org index 0ad39daeb1..0db4fe1ede 100644 --- a/inventory/host_vars/mirrorlist-host1plus.fedoraproject.org +++ b/inventory/host_vars/mirrorlist-host1plus.fedoraproject.org @@ -6,5 +6,6 @@ ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_virthost eth0_ip: 5.175.150.49 +eth0_nm: 255.255.255.240 vmhost: host1plus01.fedoraproject.org datacenter: host1plus diff --git a/inventory/host_vars/mirrorlist-ibiblio.fedoraproject.org b/inventory/host_vars/mirrorlist-ibiblio.fedoraproject.org index d9e5bf3439..b9f2c1cb5c 100644 --- a/inventory/host_vars/mirrorlist-ibiblio.fedoraproject.org +++ b/inventory/host_vars/mirrorlist-ibiblio.fedoraproject.org @@ -6,5 +6,6 @@ ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7-ext ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_ibiblio04 eth0_ip: 152.19.134.194 +eth0_nm: 255.255.255.128 vmhost: ibiblio04.fedoraproject.org datacenter: ibiblio diff --git a/inventory/host_vars/mirrorlist-ibiblio02.fedoraproject.org b/inventory/host_vars/mirrorlist-ibiblio02.fedoraproject.org index 13387ea3ea..604754c35f 100644 --- a/inventory/host_vars/mirrorlist-ibiblio02.fedoraproject.org +++ b/inventory/host_vars/mirrorlist-ibiblio02.fedoraproject.org @@ -6,5 +6,6 @@ ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7-ext ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests eth0_ip: 152.19.134.197 +eth0_nm: 255.255.255.128 vmhost: ibiblio05.fedoraproject.org datacenter: ibiblio diff --git a/inventory/host_vars/mirrorlist-osuosl.fedoraproject.org b/inventory/host_vars/mirrorlist-osuosl.fedoraproject.org index aac1296c3b..98e8a168b0 100644 --- a/inventory/host_vars/mirrorlist-osuosl.fedoraproject.org +++ b/inventory/host_vars/mirrorlist-osuosl.fedoraproject.org @@ -6,5 +6,6 @@ ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_server eth0_ip: 140.211.169.228 +eth0_nm: 255.255.255.128 vmhost: osuosl02.fedoraproject.org datacenter: osuosl diff --git a/inventory/host_vars/noc02.fedoraproject.org b/inventory/host_vars/noc02.fedoraproject.org index d5f74f097c..3f9d2f660d 100644 --- a/inventory/host_vars/noc02.fedoraproject.org +++ b/inventory/host_vars/noc02.fedoraproject.org @@ -6,6 +6,7 @@ ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7 ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_ibiblio04 eth0_ip: 152.19.134.192 +eth0_nm: 255.255.255.128 vmhost: ibiblio04.fedoraproject.org datacenter: ibiblio postfix_group: vpn diff --git a/inventory/host_vars/ns02.fedoraproject.org b/inventory/host_vars/ns02.fedoraproject.org index ffc9479b01..19a1ef9cb7 100644 --- a/inventory/host_vars/ns02.fedoraproject.org +++ b/inventory/host_vars/ns02.fedoraproject.org @@ -6,6 +6,7 @@ dns: 8.8.8.8 volgroup: /dev/vg_guests eth0_ip: 152.19.134.139 +eth0_nm: 255.255.255.128 ansible_ssh_host: ns02.fedoraproject.org postfix_group: vpn diff --git a/inventory/host_vars/ns05.fedoraproject.org b/inventory/host_vars/ns05.fedoraproject.org index e02f9a9436..e915a50886 100644 --- a/inventory/host_vars/ns05.fedoraproject.org +++ b/inventory/host_vars/ns05.fedoraproject.org @@ -6,6 +6,7 @@ dns: 62.116.130.3 volgroup: /dev/VolGuests00 eth0_ip: 85.236.55.10 +eth0_nm: 255.255.255.240 ansible_ssh_host: ns05.fedoraproject.org postfix_group: vpn diff --git a/inventory/host_vars/osuosl01.fedoraproject.org b/inventory/host_vars/osuosl01.fedoraproject.org index caeab1f2ee..28a2944986 100644 --- a/inventory/host_vars/osuosl01.fedoraproject.org +++ b/inventory/host_vars/osuosl01.fedoraproject.org @@ -3,3 +3,5 @@ datacenter: osuosl virthost: true nrpe_procs_warn: 900 nrpe_procs_crit: 1000 +br0_ip: 140.211.169.194 +br0_nm: 255.255.255.128 diff --git a/inventory/host_vars/osuosl02.fedoraproject.org b/inventory/host_vars/osuosl02.fedoraproject.org index caeab1f2ee..00b2185a42 100644 --- a/inventory/host_vars/osuosl02.fedoraproject.org +++ b/inventory/host_vars/osuosl02.fedoraproject.org @@ -3,3 +3,5 @@ datacenter: osuosl virthost: true nrpe_procs_warn: 900 nrpe_procs_crit: 1000 +br0_ip: 140.211.169.195 +br0_nm: 140.211.169.194 diff --git a/inventory/host_vars/osuosl03.fedoraproject.org b/inventory/host_vars/osuosl03.fedoraproject.org index caeab1f2ee..bd2106abc3 100644 --- a/inventory/host_vars/osuosl03.fedoraproject.org +++ b/inventory/host_vars/osuosl03.fedoraproject.org @@ -3,3 +3,5 @@ datacenter: osuosl virthost: true nrpe_procs_warn: 900 nrpe_procs_crit: 1000 +br0_ip: 140.211.169.200 +br0_nm: 140.211.169.195 diff --git a/inventory/host_vars/pagure-stg01.fedoraproject.org b/inventory/host_vars/pagure-stg01.fedoraproject.org index 065f1323ec..f631a26fce 100644 --- a/inventory/host_vars/pagure-stg01.fedoraproject.org +++ b/inventory/host_vars/pagure-stg01.fedoraproject.org @@ -9,6 +9,7 @@ ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_server eth0_ip: 140.211.169.203 +eth0_ip: 255.255.255.128 ansible_ssh_host: pagure-stg01.fedoraproject.org vmhost: osuosl02.fedoraproject.org diff --git a/inventory/host_vars/pagure01.fedoraproject.org b/inventory/host_vars/pagure01.fedoraproject.org index 411a85ef30..02a912e1d5 100644 --- a/inventory/host_vars/pagure01.fedoraproject.org +++ b/inventory/host_vars/pagure01.fedoraproject.org @@ -9,6 +9,7 @@ ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_server eth0_ip: 140.211.169.204 +eth0_nm: 255.255.255.128 ansible_ssh_host: pagure.fedoraproject.org vmhost: osuosl02.fedoraproject.org diff --git a/inventory/host_vars/people01.fedoraproject.org b/inventory/host_vars/people01.fedoraproject.org index 53d5baeed0..2f5350bd1c 100644 --- a/inventory/host_vars/people01.fedoraproject.org +++ b/inventory/host_vars/people01.fedoraproject.org @@ -7,6 +7,7 @@ gw: 152.19.134.129 dns: 8.8.8.8 volgroup: /dev/vg_guests eth0_ip: 152.19.134.196 +eth0_nm: 255.255.255.128 ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-people ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ postfix_group: vpn diff --git a/inventory/host_vars/proxy02.fedoraproject.org b/inventory/host_vars/proxy02.fedoraproject.org index b812e95fab..c0328ec39d 100644 --- a/inventory/host_vars/proxy02.fedoraproject.org +++ b/inventory/host_vars/proxy02.fedoraproject.org @@ -11,6 +11,7 @@ vmhost: internetx01.fedoraproject.org volgroup: /dev/VolGuests00 eth0_ip: 85.236.55.6 +eth0_nm: 255.255.255.240 # This is consumed by the roles/fedora-web/main role sponsor: internetx diff --git a/inventory/host_vars/proxy03.fedoraproject.org b/inventory/host_vars/proxy03.fedoraproject.org index e89fb372f6..68d2f7b9f9 100644 --- a/inventory/host_vars/proxy03.fedoraproject.org +++ b/inventory/host_vars/proxy03.fedoraproject.org @@ -10,6 +10,7 @@ vmhost: tummy01.fedoraproject.org volgroup: /dev/vg_host eth0_ip: 66.35.62.162 +eth0_nm: 255.255.255.240 # This is consumed by the roles/fedora-web/main role sponsor: tummy diff --git a/inventory/host_vars/proxy04.fedoraproject.org b/inventory/host_vars/proxy04.fedoraproject.org index 43e3f2d567..e9b1745a80 100644 --- a/inventory/host_vars/proxy04.fedoraproject.org +++ b/inventory/host_vars/proxy04.fedoraproject.org @@ -10,6 +10,7 @@ vmhost: ibiblio02.fedoraproject.org volgroup: /dev/vg_guests eth0_ip: 152.19.134.142 +eth0_nm: 255.255.255.128 # This is consumed by the roles/fedora-web/main role sponsor: ibiblio diff --git a/inventory/host_vars/proxy05.fedoraproject.org b/inventory/host_vars/proxy05.fedoraproject.org index baea3f001f..608252e879 100644 --- a/inventory/host_vars/proxy05.fedoraproject.org +++ b/inventory/host_vars/proxy05.fedoraproject.org @@ -11,6 +11,7 @@ vmhost: host1plus01.fedoraproject.org volgroup: /dev/vg_virthost eth0_ip: 5.175.150.50 +eth0_nm: 255.255.255.240 # This is consumed by the roles/fedora-web/main role sponsor: host1plus diff --git a/inventory/host_vars/proxy06.fedoraproject.org b/inventory/host_vars/proxy06.fedoraproject.org index 055a56d143..0f0cd374ca 100644 --- a/inventory/host_vars/proxy06.fedoraproject.org +++ b/inventory/host_vars/proxy06.fedoraproject.org @@ -10,6 +10,7 @@ vmhost: osuosl01.fedoraproject.org volgroup: /dev/vg_Server eth0_ip: 140.211.169.196 +eth0_nm: 255.255.255.128 # This is consumed by the roles/fedora-web/main role sponsor: osuosl diff --git a/inventory/host_vars/proxy07.fedoraproject.org b/inventory/host_vars/proxy07.fedoraproject.org index 8e391f4681..09720f8c66 100644 --- a/inventory/host_vars/proxy07.fedoraproject.org +++ b/inventory/host_vars/proxy07.fedoraproject.org @@ -5,6 +5,7 @@ dns: 217.112.87.147 volgroup: /dev/Guests00 eth0_ip: 213.175.193.206 +eth0_nm: 255.255.255.192 vmhost: bodhost01.fedoraproject.org datacenter: bodhost diff --git a/inventory/host_vars/proxy08.fedoraproject.org b/inventory/host_vars/proxy08.fedoraproject.org index 22efb9e504..cbb854253a 100644 --- a/inventory/host_vars/proxy08.fedoraproject.org +++ b/inventory/host_vars/proxy08.fedoraproject.org @@ -6,6 +6,10 @@ ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_Server eth0_ip: 67.203.2.67 +eth0_nm: 255.255.255.248 +has_ipv6: true +eth0_ipv6: 2607:f188::dead:beef:cafe:fed1 +eth0_ipv6_gw: 2607:f188::1 vmhost: coloamer01.fedoraproject.org datacenter: coloamer diff --git a/inventory/host_vars/proxy09.fedoraproject.org b/inventory/host_vars/proxy09.fedoraproject.org index 90a77bcfbc..1a6a9cf40b 100644 --- a/inventory/host_vars/proxy09.fedoraproject.org +++ b/inventory/host_vars/proxy09.fedoraproject.org @@ -10,6 +10,7 @@ vmhost: osuosl02.fedoraproject.org volgroup: /dev/vg_guests eth0_ip: 140.211.169.206 +eth0_nm: 255.255.255.128 # This is consumed by the roles/fedora-web/main role sponsor: osuosl diff --git a/inventory/host_vars/proxy11.fedoraproject.org b/inventory/host_vars/proxy11.fedoraproject.org index 472825ef02..1419fb8ad8 100644 --- a/inventory/host_vars/proxy11.fedoraproject.org +++ b/inventory/host_vars/proxy11.fedoraproject.org @@ -11,6 +11,7 @@ vmhost: dedicatedsolutions01.fedoraproject.org volgroup: /dev/vg_virthost eth0_ip: 67.219.144.68 +eth0_nm: 255.255.255.240 # This is consumed by the roles/fedora-web/main role sponsor: dedicatedsolutions diff --git a/inventory/host_vars/proxy12.fedoraproject.org b/inventory/host_vars/proxy12.fedoraproject.org index 43350a3c15..649c9ed2f9 100644 --- a/inventory/host_vars/proxy12.fedoraproject.org +++ b/inventory/host_vars/proxy12.fedoraproject.org @@ -10,6 +10,7 @@ vmhost: ibiblio05.fedoraproject.org volgroup: /dev/vg_guests eth0_ip: 152.19.134.198 +eth0_nm: 255.255.255.128 # This is consumed by the roles/fedora-web/main role sponsor: ibiblio diff --git a/inventory/host_vars/qa-stg01.qa.fedoraproject.org b/inventory/host_vars/qa-stg01.qa.fedoraproject.org index 6b20df681f..2fdaa31f0b 100644 --- a/inventory/host_vars/qa-stg01.qa.fedoraproject.org +++ b/inventory/host_vars/qa-stg01.qa.fedoraproject.org @@ -6,6 +6,7 @@ ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-23 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/23/Server/x86_64/os/ volgroup: /dev/vg_guests eth0_ip: 10.5.124.230 +eth0_nm: 255.255.255.128 vmhost: virthost-comm04.qa.fedoraproject.org datacenter: phx2 fas_client_groups: sysadmin-qa,sysadmin-main diff --git a/inventory/host_vars/qa02.qa.fedoraproject.org b/inventory/host_vars/qa02.qa.fedoraproject.org index 8eda2760a6..a4698fb80d 100644 --- a/inventory/host_vars/qa02.qa.fedoraproject.org +++ b/inventory/host_vars/qa02.qa.fedoraproject.org @@ -6,6 +6,7 @@ datacenter: phx2 # hardware and setup information eth0_ip: 10.5.124.152 +eth0_nm: 255.255.255.128 eth0_mac: 00:21:5e:c6:cc:9c eth_interface: eth0 volgroup: vmstore diff --git a/inventory/host_vars/qa04.qa.fedoraproject.org b/inventory/host_vars/qa04.qa.fedoraproject.org index b344fde54e..50785cad5a 100644 --- a/inventory/host_vars/qa04.qa.fedoraproject.org +++ b/inventory/host_vars/qa04.qa.fedoraproject.org @@ -5,6 +5,7 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers" # hardware and setup information eth0_ip: 10.5.124.154 +eth0_nm: 255.255.255.128 eth0_mac: 00:21:5e:c7:2a:1c eth_interface: eth0 volgroup: vmstore diff --git a/inventory/host_vars/qa08.qa.fedoraproject.org b/inventory/host_vars/qa08.qa.fedoraproject.org index 1b66e934a3..e408ef2045 100644 --- a/inventory/host_vars/qa08.qa.fedoraproject.org +++ b/inventory/host_vars/qa08.qa.fedoraproject.org @@ -6,6 +6,7 @@ datacenter: phx2 # hardware and setup information eth0_ip: 10.5.124.158 +eth0_nm: 255.255.255.128 eth0_mac: e4:1f:13:e5:46:80 eth_interface: eth0 volgroup: vmstore diff --git a/inventory/host_vars/qadevel.qa.fedoraproject.org b/inventory/host_vars/qadevel.qa.fedoraproject.org index b4fdc166d1..5f672e504b 100644 --- a/inventory/host_vars/qadevel.qa.fedoraproject.org +++ b/inventory/host_vars/qadevel.qa.fedoraproject.org @@ -6,6 +6,7 @@ ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-23 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/23/Server/x86_64/os/ volgroup: /dev/VirtGuests eth0_ip: 10.5.124.180 +eth0_nm: 255.255.255.128 vmhost: virthost-comm03.qa.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org b/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org index f388ef0ae9..dcfe6acadc 100644 --- a/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org +++ b/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org @@ -7,7 +7,7 @@ nm: 255.255.255.0 gw: 10.5.124.254 dns: 10.5.126.21 eth0_ip: 10.5.124.205 - +eth0_nm: 255.255.255.128 ############################################################ # install diff --git a/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org b/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org index a6fb50ec56..d5fabecb1d 100644 --- a/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org +++ b/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org @@ -7,7 +7,7 @@ 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 diff --git a/inventory/host_vars/resultsdb01.qa.fedoraproject.org b/inventory/host_vars/resultsdb01.qa.fedoraproject.org index 88a701631e..820ec4ce09 100644 --- a/inventory/host_vars/resultsdb01.qa.fedoraproject.org +++ b/inventory/host_vars/resultsdb01.qa.fedoraproject.org @@ -7,6 +7,7 @@ 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 diff --git a/inventory/host_vars/s390-koji01.qa.fedoraproject.org b/inventory/host_vars/s390-koji01.qa.fedoraproject.org index e9bc5a5842..c04d050c03 100644 --- a/inventory/host_vars/s390-koji01.qa.fedoraproject.org +++ b/inventory/host_vars/s390-koji01.qa.fedoraproject.org @@ -6,6 +6,7 @@ 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.191 +eth0_nm: 255.255.255.128 vmhost: virthost-s390.qa.fedoraproject.org datacenter: phx2 nrpe_procs_warn: 900 diff --git a/inventory/host_vars/secondary-bridge01.qa.fedoraproject.org b/inventory/host_vars/secondary-bridge01.qa.fedoraproject.org index a685feef71..76a232526d 100644 --- a/inventory/host_vars/secondary-bridge01.qa.fedoraproject.org +++ b/inventory/host_vars/secondary-bridge01.qa.fedoraproject.org @@ -10,3 +10,4 @@ vmhost: virthost-comm03.qa.fedoraproject.org datacenter: phx2 eth0_ip: 10.5.124.145 +eth0_nm: 255.255.255.128 diff --git a/inventory/host_vars/secondary-vault01.qa.fedoraproject.org b/inventory/host_vars/secondary-vault01.qa.fedoraproject.org index 9234f73680..49d49faee9 100644 --- a/inventory/host_vars/secondary-vault01.qa.fedoraproject.org +++ b/inventory/host_vars/secondary-vault01.qa.fedoraproject.org @@ -10,3 +10,4 @@ vmhost: virthost-comm04.qa.fedoraproject.org datacenter: phx2 eth0_ip: 10.5.124.146 +eth0_nm: 255.255.255.128 diff --git a/inventory/host_vars/smtp-mm-coloamer01.fedoraproject.org b/inventory/host_vars/smtp-mm-coloamer01.fedoraproject.org index 9378af6fcb..19471583b1 100644 --- a/inventory/host_vars/smtp-mm-coloamer01.fedoraproject.org +++ b/inventory/host_vars/smtp-mm-coloamer01.fedoraproject.org @@ -6,5 +6,6 @@ ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_coloamer01 eth0_ip: 67.203.2.69 +eth0_nm: 255.255.255.240 vmhost: coloamer01.fedoraproject.org datacenter: coloamer diff --git a/inventory/host_vars/smtp-mm-ib01.fedoraproject.org b/inventory/host_vars/smtp-mm-ib01.fedoraproject.org index 94b0df7fc5..3a9bcdb89e 100644 --- a/inventory/host_vars/smtp-mm-ib01.fedoraproject.org +++ b/inventory/host_vars/smtp-mm-ib01.fedoraproject.org @@ -4,6 +4,7 @@ gw: 152.19.134.129 dns: 152.2.21.1 152.2.253.100 volgroup: /dev/vg_guests eth0_ip: 152.19.134.143 +eth0_nm: 255.255.255.128 vmhost: ibiblio03.fedoraproject.org datacenter: ibiblio ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext diff --git a/inventory/host_vars/smtp-mm-osuosl01.fedoraproject.org b/inventory/host_vars/smtp-mm-osuosl01.fedoraproject.org index a868d85d0c..ec92c9fa6f 100644 --- a/inventory/host_vars/smtp-mm-osuosl01.fedoraproject.org +++ b/inventory/host_vars/smtp-mm-osuosl01.fedoraproject.org @@ -6,5 +6,6 @@ ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests eth0_ip: 140.211.169.205 +eth0_nm: 255.255.255.128 vmhost: osuosl02.fedoraproject.org datacenter: osuosl diff --git a/inventory/host_vars/smtp-mm-tummy01.fedoraproject.org b/inventory/host_vars/smtp-mm-tummy01.fedoraproject.org index 310b97e02d..dc8c5a0c45 100644 --- a/inventory/host_vars/smtp-mm-tummy01.fedoraproject.org +++ b/inventory/host_vars/smtp-mm-tummy01.fedoraproject.org @@ -6,5 +6,6 @@ ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7 ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_host eth0_ip: 66.35.62.164 +eth0_nm: 255.255.255.248 vmhost: tummy01.fedoraproject.org datacenter: tummy diff --git a/inventory/host_vars/torrent01.fedoraproject.org b/inventory/host_vars/torrent01.fedoraproject.org index fccc264c3b..38e54b82a9 100644 --- a/inventory/host_vars/torrent01.fedoraproject.org +++ b/inventory/host_vars/torrent01.fedoraproject.org @@ -6,6 +6,7 @@ dns: 8.8.8.8 volgroup: /dev/vg_guests eth0_ip: 152.19.134.141 +eth0_nm: 255.255.255.128 ansible_ssh_host: torrent01.fedoraproject.org ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext diff --git a/inventory/host_vars/tummy01.fedoraproject.org b/inventory/host_vars/tummy01.fedoraproject.org index c66a325764..0369238794 100644 --- a/inventory/host_vars/tummy01.fedoraproject.org +++ b/inventory/host_vars/tummy01.fedoraproject.org @@ -6,3 +6,5 @@ nm: 255.255.255.240 gw: 66.35.62.174 dns: 198.49.126.1 postfix_group: vpn +br0_ip: 66.35.62.161 +br0_nm: 255.255.255.248 diff --git a/inventory/host_vars/unbound-ib01.fedoraproject.org b/inventory/host_vars/unbound-ib01.fedoraproject.org index 9a392c71e7..5733b64c69 100644 --- a/inventory/host_vars/unbound-ib01.fedoraproject.org +++ b/inventory/host_vars/unbound-ib01.fedoraproject.org @@ -6,6 +6,7 @@ ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7 ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_ibiblio04 eth0_ip: 152.19.134.150 +eth0_nm: 255.255.255.128 vmhost: ibiblio04.fedoraproject.org datacenter: ibiblio postfix_group: vpn diff --git a/inventory/host_vars/unbound-osuosl01.fedoraproject.org b/inventory/host_vars/unbound-osuosl01.fedoraproject.org index c456296cae..973532c516 100644 --- a/inventory/host_vars/unbound-osuosl01.fedoraproject.org +++ b/inventory/host_vars/unbound-osuosl01.fedoraproject.org @@ -6,6 +6,7 @@ ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7 ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests eth0_ip: 140.211.169.201 +eth0_nm: 255.255.255.128 vmhost: osuosl03.fedoraproject.org datacenter: osuosl postfix_group: vpn diff --git a/inventory/host_vars/unbound-tummy01.fedoraproject.org b/inventory/host_vars/unbound-tummy01.fedoraproject.org index bfd8c78346..ff20d9d7db 100644 --- a/inventory/host_vars/unbound-tummy01.fedoraproject.org +++ b/inventory/host_vars/unbound-tummy01.fedoraproject.org @@ -6,5 +6,6 @@ ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7 ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_host eth0_ip: 66.35.62.163 +eth0_nm: 255.255.255.248 vmhost: tummy01.fedoraproject.org datacenter: tummy