From 75c212c169696ffa32a826347d36897f09e55b2e Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Wed, 19 Aug 2015 17:45:50 +0000 Subject: [PATCH] more removal of ibiblio01 --- inventory/hardware | 1 - .../host_vars/ibiblio01.fedoraproject.org | 10 ---------- inventory/host_vars/smtp_host_vars | 20 +++++++++---------- inventory/inventory | 1 - playbooks/groups/virthost.yml | 2 +- roles/collectd/server/files/ping.conf | 2 +- .../files/nagios/hostgroups/kvmHosts.cfg | 2 +- .../files/nagios/hostgroups/vpnclients.cfg | 2 +- .../files/nagios/hosts/ibiblio01.cfg | 14 ++++++------- .../files/nagios/services/mgmt.cfg | 6 ------ .../files/ccd/ibiblio01.fedoraproject.org | 2 +- 11 files changed, 22 insertions(+), 40 deletions(-) delete mode 100644 inventory/host_vars/ibiblio01.fedoraproject.org diff --git a/inventory/hardware b/inventory/hardware index 04abfffdd7..264f018a75 100644 --- a/inventory/hardware +++ b/inventory/hardware @@ -53,7 +53,6 @@ virthost08.phx2.fedoraproject.org virthost09.phx2.fedoraproject.org virthost10.phx2.fedoraproject.org virthost12.phx2.fedoraproject.org -ibiblio01.fedoraproject.org ibiblio02.fedoraproject.org ibiblio03.fedoraproject.org osuosl01.fedoraproject.org diff --git a/inventory/host_vars/ibiblio01.fedoraproject.org b/inventory/host_vars/ibiblio01.fedoraproject.org deleted file mode 100644 index 8588fcd634..0000000000 --- a/inventory/host_vars/ibiblio01.fedoraproject.org +++ /dev/null @@ -1,10 +0,0 @@ ---- -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 -datacenter: ibiblio -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 -freezes: true diff --git a/inventory/host_vars/smtp_host_vars b/inventory/host_vars/smtp_host_vars index 9f132c5a6b..a47f88f739 100644 --- a/inventory/host_vars/smtp_host_vars +++ b/inventory/host_vars/smtp_host_vars @@ -1,13 +1,13 @@ ---- -nm: 255.255.255.128 -gw: 152.19.134.129 -dns: 152.2.21.1 152.2.253.100 -ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-6 -ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL6-x86_64/ -volgroup: /dev/ibiblio01_vg -eth0_ip: 152.19.134.143 -vmhost: ibiblio01.fedoraproject.org -datacenter: ibiblio +# --- +# nm: 255.255.255.128 +# gw: 152.19.134.129 +# dns: 152.2.21.1 152.2.253.100 +# ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-6 +# ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL6-x86_64/ +# volgroup: ???? +# eth0_ip: 152.19.134.143 +# vmhost: ibiblio03.fedoraproject.org +# datacenter: ibiblio --- nm: 255.255.255.240 gw: 66.35.62.174 diff --git a/inventory/inventory b/inventory/inventory index a8b598d0b6..f2484c75b9 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -113,7 +113,6 @@ bodhost01.fedoraproject.org coloamer01.fedoraproject.org dedicatedsolutions01.fedoraproject.org host1plus01.fedoraproject.org -ibiblio01.fedoraproject.org ibiblio02.fedoraproject.org ibiblio03.fedoraproject.org ibiblio04.fedoraproject.org diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index 14b4d0a8fe..1a31bfb47b 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:ibiblio01.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: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 user: root gather_facts: True diff --git a/roles/collectd/server/files/ping.conf b/roles/collectd/server/files/ping.conf index 0aa539befb..22d3708b8d 100644 --- a/roles/collectd/server/files/ping.conf +++ b/roles/collectd/server/files/ping.conf @@ -3,7 +3,7 @@ LoadPlugin ping Host "tummy01.fedoraproject.org" Host "osuosl01.fedoraproject.org" - Host "ibiblio01.fedoraproject.org" + Host "ibiblio02.fedoraproject.org" Host "ibiblio04.fedoraproject.org" Host "osuosl03.fedoraproject.org" Host "serverbeach10.fedoraproject.org" diff --git a/roles/nagios_server/files/nagios/hostgroups/kvmHosts.cfg b/roles/nagios_server/files/nagios/hostgroups/kvmHosts.cfg index 2d8b8640bf..2023a6d505 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, ibiblio01, 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, serverbeach06, serverbeach07, serverbeach08, serverbeach09, serverbeach10, 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 97648ee726..8d24d2a257 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,ibiblio01,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,proxy09,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,serverbeach08,serverbeach09,ns-sb01,serverbeach10,collab03,proxy09,smtp-mm-coloamer01,host1plus01,dedicatedsolutions01,proxy05,proxy11 } diff --git a/roles/nagios_server/files/nagios/hosts/ibiblio01.cfg b/roles/nagios_server/files/nagios/hosts/ibiblio01.cfg index 126c0515d4..5bc5f5333a 100644 --- a/roles/nagios_server/files/nagios/hosts/ibiblio01.cfg +++ b/roles/nagios_server/files/nagios/hosts/ibiblio01.cfg @@ -1,7 +1,7 @@ -define host { - host_name ibiblio01 - alias ibiblio01.fedoraproject.org - use defaulttemplate - address ibiblio04.fedoraproject.org - parents ibiblio-gw -} +# define host { +# host_name ibiblio01 +# alias ibiblio01.fedoraproject.org +# use defaulttemplate +# address ibiblio04.fedoraproject.org +# parents ibiblio-gw +# } diff --git a/roles/nagios_server/files/nagios/services/mgmt.cfg b/roles/nagios_server/files/nagios/services/mgmt.cfg index 7b0571e16a..f13e504571 100644 --- a/roles/nagios_server/files/nagios/services/mgmt.cfg +++ b/roles/nagios_server/files/nagios/services/mgmt.cfg @@ -308,12 +308,6 @@ define service { # use defaulttemplate # } -# define service { -# host_name ibiblio01.mgmt.fedoraproject.org -# service_description ibiblio01.mgmt.fedoraproject.org-http -# check_command check_http!ibiblio01.mgmt.fedoraproject.org.fedoraproject.org -# use defaulttemplate -# } # HTTPS diff --git a/roles/openvpn/server/files/ccd/ibiblio01.fedoraproject.org b/roles/openvpn/server/files/ccd/ibiblio01.fedoraproject.org index bb2165503c..3b877fe5a0 100644 --- a/roles/openvpn/server/files/ccd/ibiblio01.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/ibiblio01.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.40 192.168.0.40 +#ifconfig-push 192.168.1.40 192.168.0.40