From 18dad256a088e2b920a11280db9e59f23251a57e Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Wed, 30 Sep 2015 21:42:48 +0000 Subject: [PATCH] there is no virthost08, there is only zuul --- inventory/hardware | 3 ++- inventory/inventory | 3 ++- roles/batcave/files/ssh_known_hosts | 1 - .../files/dhcpd.conf.noc01.phx2.fedoraproject.org | 6 +++--- .../files/nagios/hostgroups/kvmHosts.cfg | 2 +- .../nagios_server/files/nagios/hostgroups/mgmt.cfg | 2 +- .../files/nagios/hostgroups/nomail.cfg | 2 +- .../files/nagios/hostgroups/servers.cfg | 2 +- roles/nagios_server/files/nagios/hosts/ns03.cfg | 2 +- .../files/nagios/hosts/virthost08-mgmt.cfg | 14 +++++++------- .../files/nagios/hosts/virthost08.cfg | 14 +++++++------- 11 files changed, 26 insertions(+), 25 deletions(-) diff --git a/inventory/hardware b/inventory/hardware index 753c42cb79..085f0c9aef 100644 --- a/inventory/hardware +++ b/inventory/hardware @@ -46,10 +46,11 @@ bvirthost10.phx2.fedoraproject.org bvirthost11.phx2.fedoraproject.org [ibms] +autocloud-backend-libvirt.phx2.fedoraproject.org +autocloud-backend-vbox.phx2.fedoraproject.org virthost05.phx2.fedoraproject.org virthost06.phx2.fedoraproject.org virthost07.phx2.fedoraproject.org -virthost08.phx2.fedoraproject.org virthost09.phx2.fedoraproject.org virthost12.phx2.fedoraproject.org ibiblio02.fedoraproject.org diff --git a/inventory/inventory b/inventory/inventory index 5252c0ada1..3e933bcb81 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -231,9 +231,11 @@ autocloud-backend-vbox [autocloud-backend-libvirt] autocloud-backend01.phx2.fedoraproject.org +autocloud-backend-libvirt.phx2.fedoraproject.org [autocloud-backend-vbox] autocloud-backend02.phx2.fedoraproject.org +autocloud-backend-vbox.phx2.fedoraproject.org [autocloud-backend-stg:children] autocloud-backend-libvirt-stg @@ -701,7 +703,6 @@ virthost03.phx2.fedoraproject.org virthost05.phx2.fedoraproject.org virthost06.phx2.fedoraproject.org virthost07.phx2.fedoraproject.org -virthost08.phx2.fedoraproject.org virthost09.phx2.fedoraproject.org virthost11.phx2.fedoraproject.org virthost12.phx2.fedoraproject.org diff --git a/roles/batcave/files/ssh_known_hosts b/roles/batcave/files/ssh_known_hosts index a6c005621f..6f0625d126 100644 --- a/roles/batcave/files/ssh_known_hosts +++ b/roles/batcave/files/ssh_known_hosts @@ -450,7 +450,6 @@ virthost03.phx2.fedoraproject.org,virthost03,10.5.126.143 ssh-rsa AAAAB3NzaC1yc2 virthost05.phx2.fedoraproject.org,virthost05,10.5.126.145 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDv12hi47Dnn82ZKXOrVD0pHu29EuHmyp/svtvTcAC+hn9uBfiuknUwIk6ArtA2Thh69/tYwG8sKcEABb8tB9t3dwBoZnDnh5OTyzlLqytYV7GTil79HU/gtiwbDhlI8UZz5di/dC+rKmUSBv7L+NLfqCaLqkbgNqbt9HdYGd4JjiIvAZkIF5UL4sFZdBea/S82S66E4tMsxXPzyV7nAFHhoOOHWqlQRuIvRrqVfsZ5+dzIjf4Od9BaJqfdEm3BJGH0B3Cq4OvYDI/VbeIJYPmbU2BKzsHIiLZQ+3NdE888POJUYQgPgho8bNd5i7CmtiXjmjdN0JLbuBX8TXRo0vIz virthost05.phx2.fedoraproject.org virthost06.phx2.fedoraproject.org,virthost06,10.5.126.146 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrznTM1JUOdFiotlR3KfqoZZORSoTt+1W0iXWXWaWKuM+k7B19beZvln9scRnHPmcHjJ8sXZKrnS8HejaiU1OXwkQKpWfgiEUAJdsRgyxH5Szga5jJRw0grFNY9QabBkGGNnhAKuGsKICr0/3HBNWPjphl1WJFu1fXdwMyIpZxFmGeUXjn2JIRP0UubODBc0jjD1Ppg0BjnxrRVTteyHcHJmzuZe+O3tM71Hb/A0cSd6cEefWWBpOINEC977DXmXZws5mRdUulWHailO+JyA7DcuSjW2sw/Ll/g7tzMT70lBJzJ55SIhITxu3vuYUAYGjTdLqKAeURfVyZookC5iNl virthost06.phx2.fedoraproject.org virthost07.phx2.fedoraproject.org,virthost07,10.5.126.147 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD5fJmqIRr4MJEg+o55X/kEa0ODShE8mPEXEdUPQ4UP14aVVjLf/SSS2GKXw4yndq2LvK8tCeKybagluQtaLuwGGm3KGPKXGriudl5E85XJXCNXGwsmCTO8i4/wx9AS8KPLte0e0s7iRflqj15Xh5eEnV0W4F9/OhFFZSnU6IIZZ5xe+RJJQ4YUaO1F4RQC/7t2W77dO6/ru9YtP5VNyBaQbXSUVv8lZJwXaiWYPexz4wtHvt+eqV3Qb1ik4xW4XEN3n7Ytq7U9e7U7rMWsVg3ik8453DjbT3eBOf8WxCbvj/m3GI1y94wZpMjfsstmS7EQus7ICxiDMH4tBOJbCJ1z virthost07.phx2.fedoraproject.org -virthost08.phx2.fedoraproject.org,virthost08,10.5.126.148 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDagtAX1soXZfE8gFm6EwNOI7CRkqe3WtJmVbdrL8k9/OAkYQMQiz+ysKBUYRI0COFZppGYZMeXBGUXT0zPsIM+tSC1F9a7qlzAoKgUGCnORJnfpgfmZ/R5vtymiBeDez2BCd5giT2EdiGuiQYpbUHPqlVK0M8O6iFN+a9RE3gENC328WAbqbXaR+OMCFGjxveG3YfiUjRlvMNo5P1zwOiGrb0oXJkAsvasOA1SgSlfLa1yDQWeaqB7y54ufjaghTtCu0eEl9f/qu9+B4aHnPHzKg6jsscXRI5mFVcNyFOxLMRZdOHLacng+YG2fRyrqtd6urBZ8J1oOLLq9PsFRehn virthost08.phx2.fedoraproject.org virthost09.phx2.fedoraproject.org,virthost09,10.5.126.149 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTOShtfjnvhtxPpalna9WXj3gRw9Kw8bwlGiMgOt961Gya8XwODdyhpIGFhuw+8LodXt1XyhBuFkA+OuK24OWro7t6akaHAiYmZEDRAABhl64geEe+qpW8CP9xesM5CazxdXpuqg6YmrVMHekNXG5Oq9ebDaO8iPTK7D/IxUB+/sClpa+N1UmLRD0SF3QWWQWbH9VgLz39qFCf35VZyA4vDFiCT7BSkOTZzyDmRC1qYwAPT0WZZfXmvkvgDzu/9ryn/GFrhUJGp4B/tKAws9y2B1wlxbGmEuqUDgcoiP2UBiGchrxFUyapYoevchzdBXnE9oNSfZx85F5pAarR2p/F virthost09.phx2.fedoraproject.org virthost11.phx2.fedoraproject.org,virthost11,10.5.126.104 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7IQrtbk6i3gjCRGLrHqKE7hy+oGji3WOpjPAZ4KRMabRPU0S7R5oXNXQVJ6XGfF+/x/rFO99XZ6tBMQNqPn8cqR47ZZegyRC2Css9bnrdJBzReQGIZ+HQpkRqOf5qVNacMCTDcFa8XDw1WeCS4WyoLpdCtLWHUPD8SbvIrJtrTAFHIS0dJrpkrdyltMT8n1grUuaQg/dgHGuCg7e6+j06PjkMxj/1ghSZQ1PuGVixvQsWDihgMeT/qNowWfIksFiLdsqm/V4xdJ9UWZrebG+sGmPqgTwjOVU1V2WG2pRnf0xqzXoIC8nzfSB9zQ6UpVvePJGl8bLnJUB2KlcQker7 virthost11.phx2.fedoraproject.org virthost12.phx2.fedoraproject.org,virthost12,10.5.126.152 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCeymh1w3+TBD5xLzuCA8YholKfZvOekO8GCyRjbyU4d6u+QEuAXz7TscVzWhMzamLFZwgUT4PlVRNXEYpLb9kVQoUA+38eN9NQr2Bt7sGRARouw0NMFFJdkK4WsS+UeX9DstjcicIcAhHfdelgfGwXxdDZ8x/QIk3Ud6lkARjqgCvmxwQkpiP+MoOgnb/tCzmZGjTbyZ25WmJ7MH22KGkyVxo72gAAhyeEo+Ozs6ez1mHtNzaIhchYAV7mNO+9G/Voce+75T4SItGa6lJh5FSaN1IpCLHvDRRDvgbYIFXs38RFudtOxqxZNu+8eWyzGBF0ej2GqFlUpeiPSRCSc4KH virthost12.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 e6b45602fa..d21a5d8e5d 100644 --- a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org +++ b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org @@ -53,11 +53,11 @@ subnet 10.5.126.0 netmask 255.255.255.0 { filename "pxelinux.0"; } - host virthost08 { + host autocloud-backend-libvirt { hardware ethernet e4:1f:13:ba:e6:f8; - fixed-address 10.5.126.148; + fixed-address 10.5.126.123; next-server 10.5.126.41; - option host-name "virthost08"; + option host-name "autocloud-backend-libvirt"; filename "pxelinux.0"; } diff --git a/roles/nagios_server/files/nagios/hostgroups/kvmHosts.cfg b/roles/nagios_server/files/nagios/hostgroups/kvmHosts.cfg index 960f9e294b..4ca3f146ad 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, virthost12, virthost14, virthost15, virthost16, virthost17, virthost18, virthost-comm02, virthost-comm03, virthost-comm04, tummy01, bodhost01, osuosl01, osuosl02, osuosl03, ibiblio02, ibiblio03, ibiblio04, coloamer01, internetx01, 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, virthost09, virthost12, virthost14, virthost15, virthost16, virthost17, virthost18, virthost-comm02, virthost-comm03, virthost-comm04, tummy01, bodhost01, osuosl01, osuosl02, osuosl03, ibiblio02, ibiblio03, ibiblio04, coloamer01, internetx01, 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 a5cfde017c..51ba23166f 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,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,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 288a767318..463bef128d 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,!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,!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 4273554544..b169372d4a 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,!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,!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/ns03.cfg b/roles/nagios_server/files/nagios/hosts/ns03.cfg index 9f93787669..ac9b6c4e32 100644 --- a/roles/nagios_server/files/nagios/hosts/ns03.cfg +++ b/roles/nagios_server/files/nagios/hosts/ns03.cfg @@ -3,5 +3,5 @@ define host { alias ns03.phx2.fedoraproject.org use defaulttemplate address ns03.phx2.fedoraproject.org - parents virthost08 + parents virthost21 } diff --git a/roles/nagios_server/files/nagios/hosts/virthost08-mgmt.cfg b/roles/nagios_server/files/nagios/hosts/virthost08-mgmt.cfg index 40ec6e8857..239d782fec 100644 --- a/roles/nagios_server/files/nagios/hosts/virthost08-mgmt.cfg +++ b/roles/nagios_server/files/nagios/hosts/virthost08-mgmt.cfg @@ -1,8 +1,8 @@ -define host { - host_name virthost08.mgmt.fedoraproject.org - alias virthost08.mgmt.fedoraproject.org - use mincheck - address virthost08.mgmt.fedoraproject.org - parents fwsm01-gw -} +# define host { +# host_name virthost08.mgmt.fedoraproject.org +# alias virthost08.mgmt.fedoraproject.org +# use mincheck +# address virthost08.mgmt.fedoraproject.org +# parents fwsm01-gw +# } diff --git a/roles/nagios_server/files/nagios/hosts/virthost08.cfg b/roles/nagios_server/files/nagios/hosts/virthost08.cfg index c8a0437a9a..154b5c5386 100644 --- a/roles/nagios_server/files/nagios/hosts/virthost08.cfg +++ b/roles/nagios_server/files/nagios/hosts/virthost08.cfg @@ -1,8 +1,8 @@ -define host { - host_name virthost08 - alias virthost08.phx2.fedoraproject.org - use defaulttemplate - address virthost08.phx2.fedoraproject.org - parents fwsm01-gw -} +# define host { +# host_name virthost08 +# alias virthost08.phx2.fedoraproject.org +# use defaulttemplate +# address virthost08.phx2.fedoraproject.org +# parents fwsm01-gw +# }