From c563192af6348d464dda3b13e31f097522483084 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Wed, 2 Sep 2015 00:07:32 +0000 Subject: [PATCH] get ready to remove serverbeach --- playbooks/groups/virthost.yml | 2 +- roles/collectd/server/files/ping.conf | 1 - .../hosts/admin.fedoraproject.org.cfg | 11 ----------- .../files/nagios/hostgroups/kvmHosts.cfg | 2 +- .../files/nagios/hostgroups/vpnclients.cfg | 2 +- .../files/nagios/hosts/serverbeach06.cfg | 14 +++++++------- .../files/nagios/hosts/serverbeach07.cfg | 14 +++++++------- .../files/nagios/hosts/serverbeach08.cfg | 14 +++++++------- .../files/nagios/hosts/serverbeach10.cfg | 14 +++++++------- 9 files changed, 31 insertions(+), 43 deletions(-) diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index 1a31bfb47b..e303973809 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -3,7 +3,7 @@ # NOTE: most of these vars_path come from group_vars/backup_server or from hostvars - name: make virthost server system - hosts: virthost:bvirthost:buildvmhost:virthost-comm03.qa.fedoraproject.org:virthost-comm04.qa.fedoraproject.org:ibiblio02.fedoraproject.org:ibiblio03.fedoraproject.org:ibiblio04.fedoraproject.org:ibiblio05.fedoraproject.org:serverbeach07.fedoraproject.org:coloamer01.fedoraproject.org:osuosl03.fedoraproject.org:host1plus01.fedoraproject.org:dedicatedsolutions01.fedoraproject.org:tummy01.fedoraproject.org:osuosl01.fedoraproject.org:virthost-comm02.qa.fedoraproject.org:serverbeach06.fedoraproject.org:serverbeach08.fedoraproject.org:virthost-s390.qa.fedoraproject.org:osuosl02.fedoraproject.org:serverbeach10.fedoraproject.org:serverbeach09.fedoraproject.org:virthost19.phx2.fedoraproject.org:virthost20.phx2.fedoraproject.org:virthost21.phx2.fedoraproject.org:virthost22.phx2.fedoraproject.org + hosts: virthost:bvirthost:buildvmhost:virthost-comm03.qa.fedoraproject.org:virthost-comm04.qa.fedoraproject.org:ibiblio02.fedoraproject.org:ibiblio03.fedoraproject.org:ibiblio04.fedoraproject.org:ibiblio05.fedoraproject.org:coloamer01.fedoraproject.org:osuosl03.fedoraproject.org:host1plus01.fedoraproject.org:dedicatedsolutions01.fedoraproject.org:tummy01.fedoraproject.org:osuosl01.fedoraproject.org:virthost-comm02.qa.fedoraproject.org:virthost-s390.qa.fedoraproject.org:osuosl02.fedoraproject.org:serverbeach09.fedoraproject.org:virthost19.phx2.fedoraproject.org:virthost20.phx2.fedoraproject.org:virthost21.phx2.fedoraproject.org:virthost22.phx2.fedoraproject.org user: root gather_facts: True diff --git a/roles/collectd/server/files/ping.conf b/roles/collectd/server/files/ping.conf index 22d3708b8d..3340544fa2 100644 --- a/roles/collectd/server/files/ping.conf +++ b/roles/collectd/server/files/ping.conf @@ -6,7 +6,6 @@ LoadPlugin ping Host "ibiblio02.fedoraproject.org" Host "ibiblio04.fedoraproject.org" Host "osuosl03.fedoraproject.org" - Host "serverbeach10.fedoraproject.org" Host "internetx01.fedoraproject.org" Host "bodhost01.fedoraproject.org" Host "coloamer01.fedoraproject.org" 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 eb5699ccdc..d80e18522e 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 @@ -264,14 +264,3 @@ define host { } -# -# serverbeach -# - -define host { - host_name serverbeach06.fedoraproject.org - alias serverbeach06.fedoraproject.org - use defaulttemplate - address 66.135.60.117 -} - diff --git a/roles/nagios_server/files/nagios/hostgroups/kvmHosts.cfg b/roles/nagios_server/files/nagios/hostgroups/kvmHosts.cfg index 2023a6d505..40b9897a6d 100644 --- a/roles/nagios_server/files/nagios/hostgroups/kvmHosts.cfg +++ b/roles/nagios_server/files/nagios/hostgroups/kvmHosts.cfg @@ -5,5 +5,5 @@ define hostgroup { hostgroup_name kvmServers alias kvmServers - members bvirthost06, bvirthost07, bvirthost08, bvirthost09, bvirthost10, bvirthost11, virthost01, virthost02, virthost11, virthost03, virthost05, virthost06, virthost07, virthost08, virthost09, virthost10, virthost12, virthost14, virthost15, virthost16, virthost17, virthost18, virthost-comm02, virthost-comm03, virthost-comm04, tummy01, bodhost01, osuosl01, osuosl02, osuosl03, ibiblio02, ibiblio03, ibiblio04, coloamer01, internetx01, serverbeach06, serverbeach07, serverbeach08, serverbeach09, serverbeach10, qa09.qa, qa10.qa, qa11.qa, qa12.qa, qa13.qa, qa14.qa, host1plus01, dedicatedsolutions01 + members bvirthost06, bvirthost07, bvirthost08, bvirthost09, bvirthost10, bvirthost11, virthost01, virthost02, virthost11, virthost03, virthost05, virthost06, virthost07, virthost08, virthost09, virthost10, virthost12, virthost14, virthost15, virthost16, virthost17, virthost18, virthost-comm02, virthost-comm03, virthost-comm04, tummy01, bodhost01, osuosl01, osuosl02, osuosl03, ibiblio02, ibiblio03, ibiblio04, coloamer01, internetx01, serverbeach09, qa09.qa, qa10.qa, qa11.qa, qa12.qa, qa13.qa, qa14.qa, host1plus01, dedicatedsolutions01 } diff --git a/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg b/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg index 66af08ceb4..7b34d6dbef 100644 --- a/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg +++ b/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg @@ -5,5 +5,5 @@ define hostgroup { hostgroup_name vpnclients alias vpnclients - members tummy01,unbound-tummy01,smtp-mm-tummy01,proxy03,unbound-osuosl01,bodhost01,proxy07,coloamer01,proxy08,download-ib02,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent01,ibiblio03,ibiblio04,people01,internetx01,hosted-lists01,ns05,proxy02,osuosl01,proxy06,osuosl02,osuosl03,hosted03,ibiblio02,serverbeach08,serverbeach09,ns-sb01,serverbeach10,collab03,smtp-mm-coloamer01,host1plus01,dedicatedsolutions01,proxy05,proxy11 + members tummy01,unbound-tummy01,smtp-mm-tummy01,proxy03,unbound-osuosl01,bodhost01,proxy07,coloamer01,proxy08,download-ib02,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent01,ibiblio03,ibiblio04,people01,internetx01,hosted-lists01,ns05,proxy02,osuosl01,proxy06,osuosl02,osuosl03,hosted03,ibiblio02,serverbeach09,ns-sb01,collab03,smtp-mm-coloamer01,host1plus01,dedicatedsolutions01,proxy05,proxy11 } diff --git a/roles/nagios_server/files/nagios/hosts/serverbeach06.cfg b/roles/nagios_server/files/nagios/hosts/serverbeach06.cfg index 3e14cd69d6..ef178c7470 100644 --- a/roles/nagios_server/files/nagios/hosts/serverbeach06.cfg +++ b/roles/nagios_server/files/nagios/hosts/serverbeach06.cfg @@ -1,7 +1,7 @@ -define host { - host_name serverbeach06 - alias serverbeach06.fedoraproject.org - use defaulttemplate - address serverbeach06.fedoraproject.org - parents fwsm01-gw -} +# define host { +# host_name serverbeach06 +# alias serverbeach06.fedoraproject.org +# use defaulttemplate +# address serverbeach06.fedoraproject.org +# parents fwsm01-gw +# } diff --git a/roles/nagios_server/files/nagios/hosts/serverbeach07.cfg b/roles/nagios_server/files/nagios/hosts/serverbeach07.cfg index e0135e506e..83dbd46f93 100644 --- a/roles/nagios_server/files/nagios/hosts/serverbeach07.cfg +++ b/roles/nagios_server/files/nagios/hosts/serverbeach07.cfg @@ -1,7 +1,7 @@ -define host { - host_name serverbeach07 - alias serverbeach07.fedoraproject.org - use defaulttemplate - address serverbeach07.fedoraproject.org - parents fwsm01-gw -} +# define host { +# host_name serverbeach07 +# alias serverbeach07.fedoraproject.org +# use defaulttemplate +# address serverbeach07.fedoraproject.org +# parents fwsm01-gw +# } diff --git a/roles/nagios_server/files/nagios/hosts/serverbeach08.cfg b/roles/nagios_server/files/nagios/hosts/serverbeach08.cfg index a50efe1b13..1dccc66c19 100644 --- a/roles/nagios_server/files/nagios/hosts/serverbeach08.cfg +++ b/roles/nagios_server/files/nagios/hosts/serverbeach08.cfg @@ -1,7 +1,7 @@ -define host { - host_name serverbeach08 - alias serverbeach08.fedoraproject.org - use defaulttemplate - address serverbeach08.fedoraproject.org - parents fwsm01-gw -} +# define host { +# host_name serverbeach08 +# alias serverbeach08.fedoraproject.org +# use defaulttemplate +# address serverbeach08.fedoraproject.org +# parents fwsm01-gw +# } diff --git a/roles/nagios_server/files/nagios/hosts/serverbeach10.cfg b/roles/nagios_server/files/nagios/hosts/serverbeach10.cfg index 30fb1feb65..b7555fbe29 100644 --- a/roles/nagios_server/files/nagios/hosts/serverbeach10.cfg +++ b/roles/nagios_server/files/nagios/hosts/serverbeach10.cfg @@ -1,7 +1,7 @@ -define host { - host_name serverbeach10 - alias serverbeach10.fedoraproject.org - use defaulttemplate - address serverbeach10.fedoraproject.org - parents fwsm01-gw -} +# define host { +# host_name serverbeach10 +# alias serverbeach10.fedoraproject.org +# use defaulttemplate +# address serverbeach10.fedoraproject.org +# parents fwsm01-gw +# }