diff --git a/inventory/hardware b/inventory/hardware index 264f018a75..3518a4a0de 100644 --- a/inventory/hardware +++ b/inventory/hardware @@ -51,7 +51,6 @@ virthost06.phx2.fedoraproject.org virthost07.phx2.fedoraproject.org virthost08.phx2.fedoraproject.org virthost09.phx2.fedoraproject.org -virthost10.phx2.fedoraproject.org virthost12.phx2.fedoraproject.org ibiblio02.fedoraproject.org ibiblio03.fedoraproject.org diff --git a/inventory/inventory b/inventory/inventory index 6a4a6d9206..45abedfec8 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -673,7 +673,6 @@ virthost06.phx2.fedoraproject.org virthost07.phx2.fedoraproject.org virthost08.phx2.fedoraproject.org virthost09.phx2.fedoraproject.org -virthost10.phx2.fedoraproject.org virthost11.phx2.fedoraproject.org virthost12.phx2.fedoraproject.org virthost14.phx2.fedoraproject.org diff --git a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org index 1a8f2ba53a..9f808feeb1 100644 --- a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org +++ b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org @@ -69,14 +69,6 @@ subnet 10.5.126.0 netmask 255.255.255.0 { filename "pxelinux.0"; } - host virthost10 { - hardware ethernet E4:1F:13:BA:E4:F4; - fixed-address 10.5.126.150; - next-server 10.5.126.41; - option host-name "virthost10"; - filename "pxelinux.0"; - } - host virthost12 { hardware ethernet 34:40:B5:AC:63:D8; fixed-address 10.5.126.152; diff --git a/roles/dhcp_server/files/dhcpd.conf.noc03.phx2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.noc03.phx2.fedoraproject.org index 4773bfde25..bf552b17b3 100644 --- a/roles/dhcp_server/files/dhcpd.conf.noc03.phx2.fedoraproject.org +++ b/roles/dhcp_server/files/dhcpd.conf.noc03.phx2.fedoraproject.org @@ -73,14 +73,6 @@ subnet 10.5.126.0 netmask 255.255.255.0 { filename "pxelinux.0"; } - host virthost10 { - hardware ethernet E4:1F:13:BA:E4:F4; - fixed-address 10.5.126.150; - next-server 10.5.126.41; - option host-name "virthost10"; - filename "pxelinux.0"; - } - host virthost12 { hardware ethernet 34:40:B5:AC:63:D8; fixed-address 10.5.126.152; diff --git a/roles/nagios_server/files/nagios/hostgroups/kvmHosts.cfg b/roles/nagios_server/files/nagios/hostgroups/kvmHosts.cfg index 40b9897a6d..43b7d174e3 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, serverbeach09, 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, 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/mgmt.cfg b/roles/nagios_server/files/nagios/hostgroups/mgmt.cfg index bd72593b92..a5cfde017c 100644 --- a/roles/nagios_server/files/nagios/hostgroups/mgmt.cfg +++ b/roles/nagios_server/files/nagios/hostgroups/mgmt.cfg @@ -1,6 +1,6 @@ define hostgroup { hostgroup_name mgmt alias Physical hosts management inerface - members backup01.mgmt.fedoraproject.org,bc02.mgmt.fedoraproject.org,bvirthost07.mgmt.fedoraproject.org,download01.mgmt.fedoraproject.org,download02.mgmt.fedoraproject.org,download03.mgmt.fedoraproject.org,download04.mgmt.fedoraproject.org,download05.mgmt.fedoraproject.org,qa01.mgmt.fedoraproject.org,qa02.mgmt.fedoraproject.org,qa03.mgmt.fedoraproject.org,qa04.mgmt.fedoraproject.org,qa05.mgmt.fedoraproject.org,qa06.mgmt.fedoraproject.org,qa07.mgmt.fedoraproject.org,qa08.mgmt.fedoraproject.org,qa09.mgmt.fedoraproject.org,qa10.mgmt.fedoraproject.org,qa11.mgmt.fedoraproject.org,qa12.mgmt.fedoraproject.org,qa13.mgmt.fedoraproject.org,qa14.mgmt.fedoraproject.org,virthost01.mgmt.fedoraproject.org,virthost02.mgmt.fedoraproject.org,virthost11.mgmt.fedoraproject.org,virthost03.mgmt.fedoraproject.org,virthost05.mgmt.fedoraproject.org,virthost06.mgmt.fedoraproject.org,virthost07.mgmt.fedoraproject.org,virthost08.mgmt.fedoraproject.org,virthost09.mgmt.fedoraproject.org,virthost10.mgmt.fedoraproject.org,atomic01.mgmt.fedoraproject.org,virthost12.mgmt.fedoraproject.org,virthost14.mgmt.fedoraproject.org,virthost15.mgmt.fedoraproject.org,virthost16.mgmt.fedoraproject.org,virthost17.mgmt.fedoraproject.org,virthost18.mgmt.fedoraproject.org,virthost-comm02.mgmt.fedoraproject.org, virthost-comm03.mgmt.fedoraproject.org, virthost-comm04.mgmt.fedoraproject.org,sign-vault03.mgmt.fedoraproject.org,sign-vault04.mgmt.fedoraproject.org,fed-cloud09.mgmt.fedoraproject.org,fed-cloud10.mgmt.fedoraproject.org,fed-cloud11.mgmt.fedoraproject.org,fed-cloud12.mgmt.fedoraproject.org,fed-cloud13.mgmt.fedoraproject.org,fed-cloud14.mgmt.fedoraproject.org,fed-cloud15.mgmt.fedoraproject.org + members backup01.mgmt.fedoraproject.org,bc02.mgmt.fedoraproject.org,bvirthost07.mgmt.fedoraproject.org,download01.mgmt.fedoraproject.org,download02.mgmt.fedoraproject.org,download03.mgmt.fedoraproject.org,download04.mgmt.fedoraproject.org,download05.mgmt.fedoraproject.org,qa01.mgmt.fedoraproject.org,qa02.mgmt.fedoraproject.org,qa03.mgmt.fedoraproject.org,qa04.mgmt.fedoraproject.org,qa05.mgmt.fedoraproject.org,qa06.mgmt.fedoraproject.org,qa07.mgmt.fedoraproject.org,qa08.mgmt.fedoraproject.org,qa09.mgmt.fedoraproject.org,qa10.mgmt.fedoraproject.org,qa11.mgmt.fedoraproject.org,qa12.mgmt.fedoraproject.org,qa13.mgmt.fedoraproject.org,qa14.mgmt.fedoraproject.org,virthost01.mgmt.fedoraproject.org,virthost02.mgmt.fedoraproject.org,virthost11.mgmt.fedoraproject.org,virthost03.mgmt.fedoraproject.org,virthost05.mgmt.fedoraproject.org,virthost06.mgmt.fedoraproject.org,virthost07.mgmt.fedoraproject.org,virthost08.mgmt.fedoraproject.org,virthost09.mgmt.fedoraproject.org,atomic01.mgmt.fedoraproject.org,virthost12.mgmt.fedoraproject.org,virthost14.mgmt.fedoraproject.org,virthost15.mgmt.fedoraproject.org,virthost16.mgmt.fedoraproject.org,virthost17.mgmt.fedoraproject.org,virthost18.mgmt.fedoraproject.org,virthost-comm02.mgmt.fedoraproject.org, virthost-comm03.mgmt.fedoraproject.org, virthost-comm04.mgmt.fedoraproject.org,sign-vault03.mgmt.fedoraproject.org,sign-vault04.mgmt.fedoraproject.org,fed-cloud09.mgmt.fedoraproject.org,fed-cloud10.mgmt.fedoraproject.org,fed-cloud11.mgmt.fedoraproject.org,fed-cloud12.mgmt.fedoraproject.org,fed-cloud13.mgmt.fedoraproject.org,fed-cloud14.mgmt.fedoraproject.org,fed-cloud15.mgmt.fedoraproject.org } diff --git a/roles/nagios_server/files/nagios/hostgroups/nomail.cfg b/roles/nagios_server/files/nagios/hostgroups/nomail.cfg index dd3bf96622..288a767318 100644 --- a/roles/nagios_server/files/nagios/hostgroups/nomail.cfg +++ b/roles/nagios_server/files/nagios/hostgroups/nomail.cfg @@ -1,5 +1,5 @@ define hostgroup { hostgroup_name nomail alias No Mail - members *, !bastion01, !bastion02, !bastion-vpn, !backup01, !fas01.stg, !koji01.stg, !pkgs01.stg, !proxy01.stg, !bodhi-backend01.stg, !value01.stg, !smtp-mm-tummy01, !smtp-mm-ib01, !smtp-mm-coloamer01, !hosted03, !proxy01-fpo, !proxy01-wildcard, !proxy02-fpo, !proxy02-wildcard, !proxy03-fpo, !proxy04-fpo, !proxy05-fpo, !proxy06-fpo, !proxy07-fpo, !proxy07-wildcard, !proxy08-fpo, !proxy08-wildcard, !proxy10-fpo, !proxy11-fpo, !bc02.mgmt.fedoraproject.org, !fwsm01-gw, !backup01.mgmt.fedoraproject.org,!bc02.mgmt.fedoraproject.org,!bvirthost07.mgmt.fedoraproject.org,!download01.mgmt.fedoraproject.org,!download02.mgmt.fedoraproject.org,!download03.mgmt.fedoraproject.org,!download04.mgmt.fedoraproject.org,!download05.mgmt.fedoraproject.org,!qa01.mgmt.fedoraproject.org,!qa02.mgmt.fedoraproject.org,!qa03.mgmt.fedoraproject.org,!qa04.mgmt.fedoraproject.org,!qa05.mgmt.fedoraproject.org,!qa06.mgmt.fedoraproject.org,!qa07.mgmt.fedoraproject.org,!qa08.mgmt.fedoraproject.org,!qa09.mgmt.fedoraproject.org,!qa10.mgmt.fedoraproject.org,!qa11.mgmt.fedoraproject.org,!qa12.mgmt.fedoraproject.org,!qa13.mgmt.fedoraproject.org,!qa14.mgmt.fedoraproject.org,!virthost01.mgmt.fedoraproject.org,!virthost02.mgmt.fedoraproject.org,!virthost11.mgmt.fedoraproject.org,!virthost03.mgmt.fedoraproject.org,!virthost05.mgmt.fedoraproject.org,!virthost06.mgmt.fedoraproject.org,!virthost07.mgmt.fedoraproject.org,!virthost08.mgmt.fedoraproject.org,!virthost09.mgmt.fedoraproject.org,!virthost10.mgmt.fedoraproject.org,!atomic01.mgmt.fedoraproject.org,!virthost12.mgmt.fedoraproject.org,!virthost14.mgmt.fedoraproject.org,!virthost15.mgmt.fedoraproject.org,!virthost16.mgmt.fedoraproject.org,!virthost17.mgmt.fedoraproject.org,!virthost18.mgmt.fedoraproject.org,!virthost19.mgmt.fedoraproject.org,!virthost20.mgmt.fedoraproject.org,!virthost21.mgmt.fedoraproject.org,!virthost22.mgmt.fedoraproject.org,!ibiblio-gw,!packages03,!packages04,!status-fedora2, !virthost-comm02.mgmt.fedoraproject.org, !virthost-comm03.mgmt.fedoraproject.org, !virthost-comm04.mgmt.fedoraproject.org, !ppc-hub,!ppc-composer,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org, !arm01-releng00, !arm01-retrace01, !arm01-releng02, !arm01-builder03, !arm01-builder04, !arm01-builder05, !arm01-builder06, !arm01-builder07, !arm01-builder08, !arm01-builder09, !arm01-builder10, !arm01-builder11, !arm01-builder12, !arm01-builder13, !arm01-builder14, !arm01-builder15, !arm01-builder16, !arm01-builder17, !arm01-builder18, !arm01-builder19, !arm01-builder20, !arm01-builder21, !arm01-builder22, !arm01-builder23, !arm02-builder00, !arm02-builder01, !arm02-builder02, !arm02-builder03, !arm02-builder04, !arm02-builder05, !arm02-builder06, !arm02-builder07, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder14, !arm02-builder15, !arm02-builder16, !arm02-builder17, !arm02-builder18, !arm02-builder19, !arm02-builder20, !arm02-builder21, !arm02-builder22, !arm02-builder23, !arm04-builder00, !arm04-builder01, !arm04-builder02, !arm04-builder03, !arm04-builder04, !arm04-builder05, !arm04-builder06, !arm04-builder07, !arm04-builder08, !arm04-builder09, !arm04-builder10, !arm04-builder11, !arm04-builder12, !arm04-builder13, !arm04-builder14, !arm04-builder15, !arm04-builder16, !arm04-builder17, !arm04-builder18, !arm04-builder19, !arm04-builder20, !arm04-builder21, !arm04-builder22, !arm04-builder23, !buildvm-01, !buildvm-02, !buildvm-03, !buildvm-04, !buildvm-05, !buildvm-06, !buildvm-07, !buildvm-08, !buildvm-09, !buildvm-10, !buildvm-11, !buildvm-12, !buildvm-13, !buildvm-14, !buildvm-15, !buildvm-16, !buildvm-17, !buildvm-18, !buildvm-19, !buildvm-20, !buildvm-21, !buildvm-22, !buildvm-23, !buildvm-24, !buildvm-25, !buildvm-26, !buildvm-27, !buildvmhost-10, !buildvmhost-11, !buildvmhost-12, !cloud-gw, !fed-cloud09.mgmt.fedoraproject.org, !fed-cloud10.mgmt.fedoraproject.org, !fed-cloud11.mgmt.fedoraproject.org, !fed-cloud12.mgmt.fedoraproject.org, !fed-cloud13.mgmt.fedoraproject.org, !fed-cloud14.mgmt.fedoraproject.org, !fed-cloud15.mgmt.fedoraproject.org + members *, !bastion01, !bastion02, !bastion-vpn, !backup01, !fas01.stg, !koji01.stg, !pkgs01.stg, !proxy01.stg, !bodhi-backend01.stg, !value01.stg, !smtp-mm-tummy01, !smtp-mm-ib01, !smtp-mm-coloamer01, !hosted03, !proxy01-fpo, !proxy01-wildcard, !proxy02-fpo, !proxy02-wildcard, !proxy03-fpo, !proxy04-fpo, !proxy05-fpo, !proxy06-fpo, !proxy07-fpo, !proxy07-wildcard, !proxy08-fpo, !proxy08-wildcard, !proxy10-fpo, !proxy11-fpo, !bc02.mgmt.fedoraproject.org, !fwsm01-gw, !backup01.mgmt.fedoraproject.org,!bc02.mgmt.fedoraproject.org,!bvirthost07.mgmt.fedoraproject.org,!download01.mgmt.fedoraproject.org,!download02.mgmt.fedoraproject.org,!download03.mgmt.fedoraproject.org,!download04.mgmt.fedoraproject.org,!download05.mgmt.fedoraproject.org,!qa01.mgmt.fedoraproject.org,!qa02.mgmt.fedoraproject.org,!qa03.mgmt.fedoraproject.org,!qa04.mgmt.fedoraproject.org,!qa05.mgmt.fedoraproject.org,!qa06.mgmt.fedoraproject.org,!qa07.mgmt.fedoraproject.org,!qa08.mgmt.fedoraproject.org,!qa09.mgmt.fedoraproject.org,!qa10.mgmt.fedoraproject.org,!qa11.mgmt.fedoraproject.org,!qa12.mgmt.fedoraproject.org,!qa13.mgmt.fedoraproject.org,!qa14.mgmt.fedoraproject.org,!virthost01.mgmt.fedoraproject.org,!virthost02.mgmt.fedoraproject.org,!virthost11.mgmt.fedoraproject.org,!virthost03.mgmt.fedoraproject.org,!virthost05.mgmt.fedoraproject.org,!virthost06.mgmt.fedoraproject.org,!virthost07.mgmt.fedoraproject.org,!virthost08.mgmt.fedoraproject.org,!virthost09.mgmt.fedoraproject.org,!atomic01.mgmt.fedoraproject.org,!virthost12.mgmt.fedoraproject.org,!virthost14.mgmt.fedoraproject.org,!virthost15.mgmt.fedoraproject.org,!virthost16.mgmt.fedoraproject.org,!virthost17.mgmt.fedoraproject.org,!virthost18.mgmt.fedoraproject.org,!virthost19.mgmt.fedoraproject.org,!virthost20.mgmt.fedoraproject.org,!virthost21.mgmt.fedoraproject.org,!virthost22.mgmt.fedoraproject.org,!ibiblio-gw,!packages03,!packages04,!status-fedora2, !virthost-comm02.mgmt.fedoraproject.org, !virthost-comm03.mgmt.fedoraproject.org, !virthost-comm04.mgmt.fedoraproject.org, !ppc-hub,!ppc-composer,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org, !arm01-releng00, !arm01-retrace01, !arm01-releng02, !arm01-builder03, !arm01-builder04, !arm01-builder05, !arm01-builder06, !arm01-builder07, !arm01-builder08, !arm01-builder09, !arm01-builder10, !arm01-builder11, !arm01-builder12, !arm01-builder13, !arm01-builder14, !arm01-builder15, !arm01-builder16, !arm01-builder17, !arm01-builder18, !arm01-builder19, !arm01-builder20, !arm01-builder21, !arm01-builder22, !arm01-builder23, !arm02-builder00, !arm02-builder01, !arm02-builder02, !arm02-builder03, !arm02-builder04, !arm02-builder05, !arm02-builder06, !arm02-builder07, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder14, !arm02-builder15, !arm02-builder16, !arm02-builder17, !arm02-builder18, !arm02-builder19, !arm02-builder20, !arm02-builder21, !arm02-builder22, !arm02-builder23, !arm04-builder00, !arm04-builder01, !arm04-builder02, !arm04-builder03, !arm04-builder04, !arm04-builder05, !arm04-builder06, !arm04-builder07, !arm04-builder08, !arm04-builder09, !arm04-builder10, !arm04-builder11, !arm04-builder12, !arm04-builder13, !arm04-builder14, !arm04-builder15, !arm04-builder16, !arm04-builder17, !arm04-builder18, !arm04-builder19, !arm04-builder20, !arm04-builder21, !arm04-builder22, !arm04-builder23, !buildvm-01, !buildvm-02, !buildvm-03, !buildvm-04, !buildvm-05, !buildvm-06, !buildvm-07, !buildvm-08, !buildvm-09, !buildvm-10, !buildvm-11, !buildvm-12, !buildvm-13, !buildvm-14, !buildvm-15, !buildvm-16, !buildvm-17, !buildvm-18, !buildvm-19, !buildvm-20, !buildvm-21, !buildvm-22, !buildvm-23, !buildvm-24, !buildvm-25, !buildvm-26, !buildvm-27, !buildvmhost-10, !buildvmhost-11, !buildvmhost-12, !cloud-gw, !fed-cloud09.mgmt.fedoraproject.org, !fed-cloud10.mgmt.fedoraproject.org, !fed-cloud11.mgmt.fedoraproject.org, !fed-cloud12.mgmt.fedoraproject.org, !fed-cloud13.mgmt.fedoraproject.org, !fed-cloud14.mgmt.fedoraproject.org, !fed-cloud15.mgmt.fedoraproject.org } diff --git a/roles/nagios_server/files/nagios/hostgroups/servers.cfg b/roles/nagios_server/files/nagios/hostgroups/servers.cfg index 618de5e1e7..4273554544 100644 --- a/roles/nagios_server/files/nagios/hostgroups/servers.cfg +++ b/roles/nagios_server/files/nagios/hostgroups/servers.cfg @@ -5,6 +5,6 @@ define hostgroup { hostgroup_name servers alias All Servers - members *, !proxy01-fpo, !proxy01-wildcard, !proxy02-fpo, !proxy02-wildcard, !proxy03-fpo, !proxy04-fpo, !proxy05-fpo, !proxy06-fpo, !proxy07-fpo, !proxy07-wildcard, !proxy08-fpo, !proxy08-wildcard, !proxy10-fpo, !proxy11-fpo, !fwsm01-gw, !backup01.mgmt.fedoraproject.org,!bc02.mgmt.fedoraproject.org,!download01.mgmt.fedoraproject.org,!download02.mgmt.fedoraproject.org,!download03.mgmt.fedoraproject.org,!download04.mgmt.fedoraproject.org,!download05.mgmt.fedoraproject.org,!qa01.mgmt.fedoraproject.org,!qa02.mgmt.fedoraproject.org,!qa03.mgmt.fedoraproject.org,!qa04.mgmt.fedoraproject.org,!qa05.mgmt.fedoraproject.org,!qa06.mgmt.fedoraproject.org,!qa07.mgmt.fedoraproject.org,!qa08.mgmt.fedoraproject.org,!qa09.mgmt.fedoraproject.org,!qa10.mgmt.fedoraproject.org,!qa11.mgmt.fedoraproject.org,!qa12.mgmt.fedoraproject.org,!qa13.mgmt.fedoraproject.org,!qa14.mgmt.fedoraproject.org,!bvirthost07.mgmt.fedoraproject.org,!virthost01.mgmt.fedoraproject.org,!virthost02.mgmt.fedoraproject.org,!virthost11.mgmt.fedoraproject.org,!virthost03.mgmt.fedoraproject.org,!virthost05.mgmt.fedoraproject.org,!virthost06.mgmt.fedoraproject.org,!virthost07.mgmt.fedoraproject.org,!virthost08.mgmt.fedoraproject.org,!virthost09.mgmt.fedoraproject.org,!virthost10.mgmt.fedoraproject.org,!atomic01.mgmt.fedoraproject.org, !virthost12.mgmt.fedoraproject.org, !virthost14.mgmt.fedoraproject.org,!virthost15.mgmt.fedoraproject.org,!virthost16.mgmt.fedoraproject.org,!virthost17.mgmt.fedoraproject.org,!virthost18.mgmt.fedoraproject.org, !virthost19.mgmt.fedoraproject.org, !virthost20.mgmt.fedoraproject.org, !virthost21.mgmt.fedoraproject.org, !virthost22.mgmt.fedoraproject.org, !ibiblio-gw, !status-fedora2, !virthost-comm02.mgmt.fedoraproject.org, !virthost-comm03.mgmt.fedoraproject.org, !virthost-comm04.mgmt.fedoraproject.org, !ppc-hub,!ppc-composer,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org, !arm01-releng00, !arm01-retrace01, !arm01-releng02, !arm01-builder03, !arm01-builder04, !arm01-builder05, !arm01-builder06, !arm01-builder07, !arm01-builder08, !arm01-builder09, !arm01-builder10, !arm01-builder11, !arm01-builder12, !arm01-builder13, !arm01-builder14, !arm01-builder15, !arm01-builder16, !arm01-builder17, !arm01-builder18, !arm01-builder19, !arm01-builder20, !arm01-builder21, !arm01-builder22, !arm01-builder23, !arm02-builder00, !arm02-builder01, !arm02-builder02, !arm02-builder03, !arm02-builder04, !arm02-builder05, !arm02-builder06, !arm02-builder07, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder14, !arm02-builder15, !arm02-builder16, !arm02-builder17, !arm02-builder18, !arm02-builder19, !arm02-builder20, !arm02-builder21, !arm02-builder22, !arm02-builder23, !arm04-builder00, !arm04-builder01, !arm04-builder02, !arm04-builder03, !arm04-builder04, !arm04-builder05, !arm04-builder06, !arm04-builder07, !arm04-builder08, !arm04-builder09, !arm04-builder10, !arm04-builder11, !arm04-builder12, !arm04-builder13, !arm04-builder14, !arm04-builder15, !arm04-builder16, !arm04-builder17, !arm04-builder18, !arm04-builder19, !arm04-builder20, !arm04-builder21, !arm04-builder22, !arm04-builder23, !buildvm-01, !buildvm-02, !buildvm-03, !buildvm-04, !buildvm-05, !buildvm-06, !buildvm-07, !buildvm-08, !buildvm-09, !buildvm-10, !buildvm-11, !buildvm-12, !buildvm-13, !buildvm-14, !buildvm-15, !buildvm-16, !buildvm-17, !buildvm-18, !buildvm-19, !buildvm-20, !buildvm-21, !buildvm-22, !buildvm-23, !buildvm-24, !buildvm-25, !buildvm-26, !buildvm-27, !buildvmhost-10, !buildvmhost-11, !buildvmhost-12, !cloud-gw, !fed-cloud09.mgmt.fedoraproject.org, !fed-cloud10.mgmt.fedoraproject.org, !fed-cloud11.mgmt.fedoraproject.org, !fed-cloud12.mgmt.fedoraproject.org, !fed-cloud13.mgmt.fedoraproject.org, !fed-cloud14.mgmt.fedoraproject.org, !fed-cloud15.mgmt.fedoraproject.org + members *, !proxy01-fpo, !proxy01-wildcard, !proxy02-fpo, !proxy02-wildcard, !proxy03-fpo, !proxy04-fpo, !proxy05-fpo, !proxy06-fpo, !proxy07-fpo, !proxy07-wildcard, !proxy08-fpo, !proxy08-wildcard, !proxy10-fpo, !proxy11-fpo, !fwsm01-gw, !backup01.mgmt.fedoraproject.org,!bc02.mgmt.fedoraproject.org,!download01.mgmt.fedoraproject.org,!download02.mgmt.fedoraproject.org,!download03.mgmt.fedoraproject.org,!download04.mgmt.fedoraproject.org,!download05.mgmt.fedoraproject.org,!qa01.mgmt.fedoraproject.org,!qa02.mgmt.fedoraproject.org,!qa03.mgmt.fedoraproject.org,!qa04.mgmt.fedoraproject.org,!qa05.mgmt.fedoraproject.org,!qa06.mgmt.fedoraproject.org,!qa07.mgmt.fedoraproject.org,!qa08.mgmt.fedoraproject.org,!qa09.mgmt.fedoraproject.org,!qa10.mgmt.fedoraproject.org,!qa11.mgmt.fedoraproject.org,!qa12.mgmt.fedoraproject.org,!qa13.mgmt.fedoraproject.org,!qa14.mgmt.fedoraproject.org,!bvirthost07.mgmt.fedoraproject.org,!virthost01.mgmt.fedoraproject.org,!virthost02.mgmt.fedoraproject.org,!virthost11.mgmt.fedoraproject.org,!virthost03.mgmt.fedoraproject.org,!virthost05.mgmt.fedoraproject.org,!virthost06.mgmt.fedoraproject.org,!virthost07.mgmt.fedoraproject.org,!virthost08.mgmt.fedoraproject.org,!virthost09.mgmt.fedoraproject.org,!atomic01.mgmt.fedoraproject.org, !virthost12.mgmt.fedoraproject.org, !virthost14.mgmt.fedoraproject.org,!virthost15.mgmt.fedoraproject.org,!virthost16.mgmt.fedoraproject.org,!virthost17.mgmt.fedoraproject.org,!virthost18.mgmt.fedoraproject.org, !virthost19.mgmt.fedoraproject.org, !virthost20.mgmt.fedoraproject.org, !virthost21.mgmt.fedoraproject.org, !virthost22.mgmt.fedoraproject.org, !ibiblio-gw, !status-fedora2, !virthost-comm02.mgmt.fedoraproject.org, !virthost-comm03.mgmt.fedoraproject.org, !virthost-comm04.mgmt.fedoraproject.org, !ppc-hub,!ppc-composer,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org, !arm01-releng00, !arm01-retrace01, !arm01-releng02, !arm01-builder03, !arm01-builder04, !arm01-builder05, !arm01-builder06, !arm01-builder07, !arm01-builder08, !arm01-builder09, !arm01-builder10, !arm01-builder11, !arm01-builder12, !arm01-builder13, !arm01-builder14, !arm01-builder15, !arm01-builder16, !arm01-builder17, !arm01-builder18, !arm01-builder19, !arm01-builder20, !arm01-builder21, !arm01-builder22, !arm01-builder23, !arm02-builder00, !arm02-builder01, !arm02-builder02, !arm02-builder03, !arm02-builder04, !arm02-builder05, !arm02-builder06, !arm02-builder07, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder14, !arm02-builder15, !arm02-builder16, !arm02-builder17, !arm02-builder18, !arm02-builder19, !arm02-builder20, !arm02-builder21, !arm02-builder22, !arm02-builder23, !arm04-builder00, !arm04-builder01, !arm04-builder02, !arm04-builder03, !arm04-builder04, !arm04-builder05, !arm04-builder06, !arm04-builder07, !arm04-builder08, !arm04-builder09, !arm04-builder10, !arm04-builder11, !arm04-builder12, !arm04-builder13, !arm04-builder14, !arm04-builder15, !arm04-builder16, !arm04-builder17, !arm04-builder18, !arm04-builder19, !arm04-builder20, !arm04-builder21, !arm04-builder22, !arm04-builder23, !buildvm-01, !buildvm-02, !buildvm-03, !buildvm-04, !buildvm-05, !buildvm-06, !buildvm-07, !buildvm-08, !buildvm-09, !buildvm-10, !buildvm-11, !buildvm-12, !buildvm-13, !buildvm-14, !buildvm-15, !buildvm-16, !buildvm-17, !buildvm-18, !buildvm-19, !buildvm-20, !buildvm-21, !buildvm-22, !buildvm-23, !buildvm-24, !buildvm-25, !buildvm-26, !buildvm-27, !buildvmhost-10, !buildvmhost-11, !buildvmhost-12, !cloud-gw, !fed-cloud09.mgmt.fedoraproject.org, !fed-cloud10.mgmt.fedoraproject.org, !fed-cloud11.mgmt.fedoraproject.org, !fed-cloud12.mgmt.fedoraproject.org, !fed-cloud13.mgmt.fedoraproject.org, !fed-cloud14.mgmt.fedoraproject.org, !fed-cloud15.mgmt.fedoraproject.org } diff --git a/roles/nagios_server/files/nagios/hosts/fas01-stg.cfg b/roles/nagios_server/files/nagios/hosts/fas01-stg.cfg index bf2a26bb91..5ae6371ef4 100644 --- a/roles/nagios_server/files/nagios/hosts/fas01-stg.cfg +++ b/roles/nagios_server/files/nagios/hosts/fas01-stg.cfg @@ -3,5 +3,5 @@ define host { alias fas01.stg.phx2.fedoraproject.org use defaulttemplate address fas01.stg.phx2.fedoraproject.org - parents virthost10 + parents virthost20 } diff --git a/roles/nagios_server/files/nagios/hosts/koji01-stg.cfg b/roles/nagios_server/files/nagios/hosts/koji01-stg.cfg index 5284d33327..6a526e12f1 100644 --- a/roles/nagios_server/files/nagios/hosts/koji01-stg.cfg +++ b/roles/nagios_server/files/nagios/hosts/koji01-stg.cfg @@ -3,5 +3,5 @@ define host { alias koji01.stg.phx2.fedoraproject.org use defaulttemplate address koji01.stg.phx2.fedoraproject.org - parents virthost10 + parents virthost20 } diff --git a/roles/nagios_server/files/nagios/hosts/virthost10-mgmt.cfg b/roles/nagios_server/files/nagios/hosts/virthost10-mgmt.cfg deleted file mode 100644 index 823a82de10..0000000000 --- a/roles/nagios_server/files/nagios/hosts/virthost10-mgmt.cfg +++ /dev/null @@ -1,8 +0,0 @@ -define host { - host_name virthost10.mgmt.fedoraproject.org - alias virthost10.mgmt.fedoraproject.org - use mincheck - address virthost10.mgmt.fedoraproject.org - parents fwsm01-gw -} - diff --git a/roles/nagios_server/files/nagios/hosts/virthost10.cfg b/roles/nagios_server/files/nagios/hosts/virthost10.cfg deleted file mode 100644 index 27348e8189..0000000000 --- a/roles/nagios_server/files/nagios/hosts/virthost10.cfg +++ /dev/null @@ -1,8 +0,0 @@ -define host { - host_name virthost10 - alias virthost10.phx2.fedoraproject.org - use defaulttemplate - address virthost10.phx2.fedoraproject.org - parents fwsm01-gw -} -