From c9ad5669ce9a3829da135c11f5d7c033aa40c2dc Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 5 Feb 2015 22:38:38 +0000 Subject: [PATCH] Quash one of proxy06's ips so we only have 1 for it. --- inventory/host_vars/proxy06.fedoraproject.org | 2 +- playbooks/include/proxies-websites.yml | 1 - roles/httpd/proxy/templates/00-namevirtualhost.conf | 2 -- .../files/nagios-external/hosts/admin.fedoraproject.org.cfg | 2 +- roles/nagios_server/files/nagios/hosts/proxy06-fpo.cfg | 2 +- 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/inventory/host_vars/proxy06.fedoraproject.org b/inventory/host_vars/proxy06.fedoraproject.org index e807acbd2d..166817b9d6 100644 --- a/inventory/host_vars/proxy06.fedoraproject.org +++ b/inventory/host_vars/proxy06.fedoraproject.org @@ -9,7 +9,7 @@ ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ vmhost: osuosl01.fedoraproject.org volgroup: /dev/vg_Server -eth0_ip: 140.211.169.196 +eth0_ip: 140.211.169.197 # This is consumed by the roles/fedora-web/main role sponsor: osuosl diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index 29d56c3da1..397ba7fb56 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -23,7 +23,6 @@ - "80.239.156.214" - "152.19.134.142" - "[2610:28:3090:3001:dead:beef:cafe:fed3]" - - "140.211.169.196" - "213.175.193.205" - "[2001:2030:0:2::2]" - "10.5.126.52" diff --git a/roles/httpd/proxy/templates/00-namevirtualhost.conf b/roles/httpd/proxy/templates/00-namevirtualhost.conf index 51035aa68b..e2fd40c0bd 100644 --- a/roles/httpd/proxy/templates/00-namevirtualhost.conf +++ b/roles/httpd/proxy/templates/00-namevirtualhost.conf @@ -28,8 +28,6 @@ NameVirtualHost [2610:28:3090:3001:dead:beef:cafe:fed3]:443 #proxy06 NameVirtualHost 140.211.169.196:80 -NameVirtualHost 140.211.169.196:443 -NameVirtualHost 140.211.169.197:80 NameVirtualHost 140.211.169.197:443 #proxy07 diff --git a/roles/nagios_server/files/nagios-external/hosts/admin.fedoraproject.org.cfg b/roles/nagios_server/files/nagios-external/hosts/admin.fedoraproject.org.cfg index b773625d5b..4048f6f73a 100644 --- a/roles/nagios_server/files/nagios-external/hosts/admin.fedoraproject.org.cfg +++ b/roles/nagios_server/files/nagios-external/hosts/admin.fedoraproject.org.cfg @@ -170,7 +170,7 @@ define host { host_name proxy06.fedoraproject.org alias proxy06.fedoraproject.org use defaulttemplate - address 140.211.169.196 + address 140.211.169.197 parents osuosl01.fedoraproject.org } diff --git a/roles/nagios_server/files/nagios/hosts/proxy06-fpo.cfg b/roles/nagios_server/files/nagios/hosts/proxy06-fpo.cfg index 4a1115a2fd..7febec252c 100644 --- a/roles/nagios_server/files/nagios/hosts/proxy06-fpo.cfg +++ b/roles/nagios_server/files/nagios/hosts/proxy06-fpo.cfg @@ -2,6 +2,6 @@ define host { host_name proxy06-fpo alias proxy06-fpo.fedoraproject.org use defaulttemplate - address 140.211.169.196 + address 140.211.169.197 parents proxy06 }