diff --git a/inventory/host_vars/smtp_host_vars b/inventory/host_vars/smtp_host_vars index 69303166fc..9f132c5a6b 100644 --- a/inventory/host_vars/smtp_host_vars +++ b/inventory/host_vars/smtp_host_vars @@ -10,16 +10,6 @@ vmhost: ibiblio01.fedoraproject.org datacenter: ibiblio --- nm: 255.255.255.240 -gw: 80.239.156.209 -dns: 213.248.76.210 152.3.182.5 -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/GuestVolGroup00 -eth0_ip: 80.239.156.217 -vmhost: telia01.fedoraproject.org -datacenter: telia ---- -nm: 255.255.255.240 gw: 66.35.62.174 dns: 198.49.126.1 66.35.36.133 ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-6 diff --git a/roles/collectd/server/files/ping.conf b/roles/collectd/server/files/ping.conf index 443b6fb89d..0aa539befb 100644 --- a/roles/collectd/server/files/ping.conf +++ b/roles/collectd/server/files/ping.conf @@ -2,7 +2,6 @@ LoadPlugin ping Host "tummy01.fedoraproject.org" - Host "telia01.fedoraproject.org" Host "osuosl01.fedoraproject.org" Host "ibiblio01.fedoraproject.org" Host "ibiblio04.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 453275b83d..5812406989 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 @@ -89,16 +89,6 @@ define host { address 2610:28:3090:3001:dead:beef:cafe:fed3 } -# -# telia -# - -define host { - host_name telia01.fedoraproject.org - alias telia01.fedoraproject.org - use defaulttemplate - address 80.239.144.84 -} # # internetx diff --git a/roles/nagios_server/files/nagios/hostgroups/all.cfg b/roles/nagios_server/files/nagios/hostgroups/all.cfg index 00e7b6602c..69847a853c 100644 --- a/roles/nagios_server/files/nagios/hostgroups/all.cfg +++ b/roles/nagios_server/files/nagios/hostgroups/all.cfg @@ -7,5 +7,5 @@ define hostgroup { hostgroup_name all alias All hosts / Devices - members *,!telia01, + members *, } diff --git a/roles/nagios_server/files/nagios/hostgroups/euservers.cfg b/roles/nagios_server/files/nagios/hostgroups/euservers.cfg index c50bf29ae0..8aa6eb592b 100644 --- a/roles/nagios_server/files/nagios/hostgroups/euservers.cfg +++ b/roles/nagios_server/files/nagios/hostgroups/euservers.cfg @@ -6,5 +6,5 @@ define hostgroup { hostgroup_name euservers alias European Servers - members telia01 + members bodhost01 } diff --git a/roles/nagios_server/files/nagios/hostgroups/kvmHosts.cfg b/roles/nagios_server/files/nagios/hostgroups/kvmHosts.cfg index a9759d2c13..afb648ac94 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-comm01, virthost-comm02, virthost-comm03, virthost-comm04, telia01, 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-comm01, 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 } diff --git a/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg b/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg index 6a678e1c43..0c7d94159c 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,telia01,unbound-osuosl01,bodhost01,proxy07,coloamer01,proxy08,ibiblio01,download-ib02,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent02,ibiblio03,ibiblio04,backup02,people03,internetx01,hosted-lists01,ns05,proxy02,osuosl01,proxy06,osuosl02,osuosl03,hosted03,ibiblio02,hosted04,serverbeach08,serverbeach09,ns-sb01,serverbeach10,collab03,collab04,proxy09,smtp-mm-coloamer01,host1plus01,dedicatedsolutions01 + 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,torrent02,ibiblio03,ibiblio04,backup02,people03,internetx01,hosted-lists01,ns05,proxy02,osuosl01,proxy06,osuosl02,osuosl03,hosted03,ibiblio02,hosted04,serverbeach08,serverbeach09,ns-sb01,serverbeach10,collab03,collab04,proxy09,smtp-mm-coloamer01,host1plus01,dedicatedsolutions01 } diff --git a/roles/nagios_server/files/nagios/hosts/telia01.cfg b/roles/nagios_server/files/nagios/hosts/telia01.cfg index 0cd89a51aa..6cc16adcf8 100644 --- a/roles/nagios_server/files/nagios/hosts/telia01.cfg +++ b/roles/nagios_server/files/nagios/hosts/telia01.cfg @@ -1,7 +1,7 @@ -define host { - host_name telia01 - alias telia01.fedoraproject.org - use defaulttemplate - address telia01.fedoraproject.org - parents fwsm01-gw -} +# define host { +# host_name telia01 +# alias telia01.fedoraproject.org +# use defaulttemplate +# address telia01.fedoraproject.org +# parents fwsm01-gw +# }