Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

and we have ips we need for the hosts

Browse source
This commit is contained in:
Stephen Smoogen 2017-10-09 19:44:31 +00:00
parent 4065e788c2
commit d03b61ac73
7 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
inventory/host_vars/download-rdu01.fedoraproject.org
View file

@ -2,13 +2,13 @@
nrpe_procs_warn: 900 nrpe_procs_warn: 900
nrpe_procs_crit: 1000 nrpe_procs_crit: 1000
datacenter: rdu datacenter: rdu
nm: 255.255.255.192 nm: 255.255.255.0
gw: 204.85.14.62 gw: 172.31.2.254
dns: 8.8.8.8 dns: 8.8.8.8
postfix_group: vpn postfix_group: vpn
vpn: true vpn: true
eth0_ip: 204.85.14.1 eth0_ip: 172.31.2.31
eth0_nm: 255.255.255.192 eth0_nm: 255.255.255.0
eth1_ip: 172.31.1.1 eth1_ip: 172.31.1.1
eth1_nm: 255.255.255.0 eth1_nm: 255.255.255.0

8
inventory/host_vars/proxy13.fedoraproject.org
View file

@ -1,6 +1,6 @@
--- ---
nm: 255.255.255.192 nm: 255.255.255.0
gw: 204.85.14.62 gw: 172.31.2.254
dns: 8.8.8.8 dns: 8.8.8.8
ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext
@ -9,8 +9,8 @@ ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
vmhost: virthost-rdu01.fedoraproject.org vmhost: virthost-rdu01.fedoraproject.org
volgroup: /dev/vg_guests volgroup: /dev/vg_guests
eth0_ip: 204.85.14.3 eth0_ip: 172.31.2.22
eth0_nm: 255.255.255.192 eth0_nm: 255.255.255.0
# This is consumed by the roles/fedora-web/main role # This is consumed by the roles/fedora-web/main role
sponsor: redhat sponsor: redhat

8
inventory/host_vars/virthost-rdu01.fedoraproject.org
View file

@ -2,11 +2,11 @@
nrpe_procs_warn: 900 nrpe_procs_warn: 900
nrpe_procs_crit: 1000 nrpe_procs_crit: 1000
datacenter: rdu datacenter: rdu
nm: 255.255.255.192 nm: 255.255.255.0
gw: 204.85.14.62 gw: 172.31.2.254
dns: 8.8.8.8 dns: 8.8.8.8
postfix_group: vpn postfix_group: vpn
br0_ip: 204.85.14.4 br0_ip: 172.31.2.11
br0_nm: 255.255.255.192 br0_nm: 255.255.255.0
vpn: true vpn: true

5
roles/batcave/files/allows
View file

@ -75,10 +75,7 @@ require ip 2610:28:3090:3001:dead:beef:cafe:fe00/120
require ip 209.132.180.6 require ip 209.132.180.6
# rdu - rht # rdu - rht
require ip 204.85.14.1 require ip 209.132.190.0/27
require ip 204.85.14.2
require ip 204.85.14.3
require ip 204.85.14.4
# sourceware systems # sourceware systems
require ip 209.132.180.128/27 require ip 209.132.180.128/27

4
roles/httpd/proxy/templates/00-namevirtualhost.conf
View file

@ -65,8 +65,8 @@ NameVirtualHost [2610:28:3090:3001:5054:ff:feda:bbd8]:80
NameVirtualHost [2610:28:3090:3001:5054:ff:feda:bbd8]:443 NameVirtualHost [2610:28:3090:3001:5054:ff:feda:bbd8]:443
# proxy13 # proxy13
NameVirtualHost 204.85.14.3:80 NameVirtualHost 209.132.190.2:80
NameVirtualHost 204.85.14.3:443 NameVirtualHost 209.132.190.2:443
# proxy14 # proxy14
NameVirtualHost 8.43.85.67:80 NameVirtualHost 8.43.85.67:80

2
roles/mediawiki/templates/LocalSettings.php.fp.j2
View file

@ -444,7 +444,7 @@ $wgSquidServersNoPurge = array(
"192.168.1.13", "192.168.1.13",
# proxy13 # proxy13
"204.85.14.3", "209.132.190.2",
"192.168.1.158", "192.168.1.158",
# proxy14 # proxy14

2
roles/mediawiki123/templates/LocalSettings.php.fp.j2
View file

@ -384,7 +384,7 @@ $wgSquidServersNoPurge = array(
"192.168.1.13", "192.168.1.13",
# proxy13 # proxy13
"204.85.14.3", "209.132.190.2",
"192.168.1.158", "192.168.1.158",
# proxy14 # proxy14