qa06 is an ex-host

12 files changed, 13 insertions, 43 deletions

diff --git a/inventory/group_vars/nagios-new b/inventory/group_vars/nagios-new
index 3ab25d5c2..8045eeb5c 100644
--- a/inventory/group_vars/nagios-new
+++ b/inventory/group_vars/nagios-new
@@ -130,7 +130,6 @@ phx2_management_limited:
   - qa03.mgmt.fedoraproject.org
   - qa04.mgmt.fedoraproject.org
   - qa05.mgmt.fedoraproject.org
-  - qa06.mgmt.fedoraproject.org
   - qa07.mgmt.fedoraproject.org
   - qa08.mgmt.fedoraproject.org
   - rack16-pdu-a.mgmt.fedoraproject.org
diff --git a/inventory/group_vars/nagios-new-stg b/inventory/group_vars/nagios-new-stg
index 3ab25d5c2..8045eeb5c 100644
--- a/inventory/group_vars/nagios-new-stg
+++ b/inventory/group_vars/nagios-new-stg
@@ -130,7 +130,6 @@ phx2_management_limited:
   - qa03.mgmt.fedoraproject.org
   - qa04.mgmt.fedoraproject.org
   - qa05.mgmt.fedoraproject.org
-  - qa06.mgmt.fedoraproject.org
   - qa07.mgmt.fedoraproject.org
   - qa08.mgmt.fedoraproject.org
   - rack16-pdu-a.mgmt.fedoraproject.org
diff --git a/inventory/inventory b/inventory/inventory
index 3d72395f8..f2449a703 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -550,7 +550,6 @@ people02.fedoraproject.org
 qa02.qa.fedoraproject.org
 qa04.qa.fedoraproject.org
 qa05.qa.fedoraproject.org
-qa06.qa.fedoraproject.org
 qa08.qa.fedoraproject.org
 qa10.qa.fedoraproject.org
 qa11.qa.fedoraproject.org
@@ -582,7 +581,6 @@ qa14.qa.fedoraproject.org
 openqa-stg01.qa.fedoraproject.org
 
 [openqa-stg-workers]
-qa06.qa.fedoraproject.org
 qa07.qa.fedoraproject.org
 qa09.qa.fedoraproject.org
 
@@ -1305,7 +1303,6 @@ qa08.qa.fedoraproject.org
 qa04.qa.fedoraproject.org
 openqa01.qa.fedoraproject.org
 qa05.qa.fedoraproject.org
-qa06.qa.fedoraproject.org
 openqa-stg01.qa.fedoraproject.org
 qa07.qa.fedoraproject.org
 db-qa01.qa.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 eaa2e2992..d7d1db6a3 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
@@ -252,12 +252,6 @@ subnet 10.5.130.0 netmask 255.255.255.0 {
         option routers 10.5.130.254;
     }
 
-    host qa06-mgmt {
-        hardware ethernet 00:21:5e:ca:51:2d;
-	fixed-address 10.5.130.190;
-	option host-name "qa06-mgmt";
-    }
-
     host qa07-mgmt {
         hardware ethernet e4:1f:13:e7:40:01;
 	fixed-address 10.5.130.191;
@@ -1740,11 +1734,6 @@ shared-network qa {
 	     fixed-address 10.5.124.155;
         }
 
-        host qa06 {
-             hardware ethernet  00:21:5E:C6:57:08;
-	     fixed-address 10.5.124.156;
-        }
-
         host qa07 {
              hardware ethernet  E4:1F:13:E5:53:94;
 	     fixed-address 10.5.124.157;
diff --git a/roles/nagios/server/files/nagios/hostgroups/mgmt.cfg b/roles/nagios/server/files/nagios/hostgroups/mgmt.cfg
index 396f4a938..28f7d447e 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,bvirthost01.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,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-cloud08.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,bvirthost01.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,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,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-cloud08.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 5c8561e83..5eca53776 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-osuosl01, !hosted03, !proxy01, !proxy01, !proxy02, !proxy02, !proxy03, !proxy04, !proxy05, !proxy06, !proxy08, !proxy08, !proxy09, !proxy10, !proxy11, !proxy12, !fwsm01-gw, !backup01.mgmt.fedoraproject.org,!bvirthost01.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,!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,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org, !arm01-builder00, !arm01-retrace01, !arm01-builder02, !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-builder05, !arm02-builder06, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder15, !arm02-builder16, !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-builder18, !arm04-builder19, !arm04-builder20, !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-01, !buildvmhost-02, !buildvmhost-03, !buildvmhost-04, !buildvmhost-12, !cloud-gw, !fed-cloud03.mgmt.fedoraproject.org, !fed-cloud04.mgmt.fedoraproject.org, !fed-cloud05.mgmt.fedoraproject.org, !fed-cloud06.mgmt.fedoraproject.org, !fed-cloud07.mgmt.fedoraproject.org, !fed-cloud08.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         *, !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-osuosl01, !hosted03, !proxy01, !proxy01, !proxy02, !proxy02, !proxy03, !proxy04, !proxy05, !proxy06, !proxy08, !proxy08, !proxy09, !proxy10, !proxy11, !proxy12, !fwsm01-gw, !backup01.mgmt.fedoraproject.org,!bvirthost01.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,!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,!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,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org, !arm01-builder00, !arm01-retrace01, !arm01-builder02, !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-builder05, !arm02-builder06, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder15, !arm02-builder16, !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-builder18, !arm04-builder19, !arm04-builder20, !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-01, !buildvmhost-02, !buildvmhost-03, !buildvmhost-04, !buildvmhost-12, !cloud-gw, !fed-cloud03.mgmt.fedoraproject.org, !fed-cloud04.mgmt.fedoraproject.org, !fed-cloud05.mgmt.fedoraproject.org, !fed-cloud06.mgmt.fedoraproject.org, !fed-cloud07.mgmt.fedoraproject.org, !fed-cloud08.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/noswap.cfg b/roles/nagios/server/files/nagios/hostgroups/noswap.cfg
index 88a31dbfd..023be9ce9 100644
--- a/roles/nagios/server/files/nagios/hostgroups/noswap.cfg
+++ b/roles/nagios/server/files/nagios/hostgroups/noswap.cfg
@@ -1,5 +1,5 @@
 define hostgroup {
         hostgroup_name  noswap
         alias           No Swap
-        members         *, !mirrorlist-host1plus, !proxy01, !proxy01, !proxy02, !proxy02, !proxy03, !proxy04, !proxy05, !proxy06, !proxy08, !proxy08, !proxy12, !proxy12, !proxy10, !proxy11, !proxy12, !fwsm01-gw, !backup01.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,!bvirthost01.mgmt.fedoraproject.org,!virthost01.mgmt.fedoraproject.org,!virthost02.mgmt.fedoraproject.org,!virthost11.mgmt.fedoraproject.org,!virthost03.mgmt.fedoraproject.org,!virthost05.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,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org, !arm01-builder00, !arm01-retrace01, !arm01-builder02, !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-builder05, !arm02-builder06, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder15, !arm02-builder16, !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-builder18, !arm04-builder19, !arm04-builder20, !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-01, !buildvmhost-02, !buildvmhost-03, !buildvmhost-04, !buildvmhost-12, !cloud-gw, !fed-cloud03.mgmt.fedoraproject.org, !fed-cloud04.mgmt.fedoraproject.org, !fed-cloud05.mgmt.fedoraproject.org, !fed-cloud06.mgmt.fedoraproject.org, !fed-cloud07.mgmt.fedoraproject.org, !fed-cloud08.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         *, !mirrorlist-host1plus, !proxy01, !proxy01, !proxy02, !proxy02, !proxy03, !proxy04, !proxy05, !proxy06, !proxy08, !proxy08, !proxy12, !proxy12, !proxy10, !proxy11, !proxy12, !fwsm01-gw, !backup01.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,!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,!bvirthost01.mgmt.fedoraproject.org,!virthost01.mgmt.fedoraproject.org,!virthost02.mgmt.fedoraproject.org,!virthost11.mgmt.fedoraproject.org,!virthost03.mgmt.fedoraproject.org,!virthost05.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,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org, !arm01-builder00, !arm01-retrace01, !arm01-builder02, !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-builder05, !arm02-builder06, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder15, !arm02-builder16, !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-builder18, !arm04-builder19, !arm04-builder20, !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-01, !buildvmhost-02, !buildvmhost-03, !buildvmhost-04, !buildvmhost-12, !cloud-gw, !fed-cloud03.mgmt.fedoraproject.org, !fed-cloud04.mgmt.fedoraproject.org, !fed-cloud05.mgmt.fedoraproject.org, !fed-cloud06.mgmt.fedoraproject.org, !fed-cloud07.mgmt.fedoraproject.org, !fed-cloud08.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/servers.cfg b/roles/nagios/server/files/nagios/hostgroups/servers.cfg
index beecaa96a..db03e6e34 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, !proxy01, !proxy02, !proxy02, !proxy03, !proxy04, !proxy05, !proxy06, !proxy08, !proxy08, !proxy12, !proxy12, !proxy10, !proxy11, !proxy12, !fwsm01-gw, !backup01.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,!bvirthost01.mgmt.fedoraproject.org,!virthost01.mgmt.fedoraproject.org,!virthost02.mgmt.fedoraproject.org,!virthost11.mgmt.fedoraproject.org,!virthost03.mgmt.fedoraproject.org,!virthost05.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,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org, !arm01-builder00, !arm01-retrace01, !arm01-builder02, !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-builder05, !arm02-builder06, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder15, !arm02-builder16, !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-builder18, !arm04-builder19, !arm04-builder20, !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-01, !buildvmhost-02, !buildvmhost-03, !buildvmhost-04, !buildvmhost-12, !cloud-gw, !fed-cloud03.mgmt.fedoraproject.org, !fed-cloud04.mgmt.fedoraproject.org, !fed-cloud05.mgmt.fedoraproject.org, !fed-cloud06.mgmt.fedoraproject.org, !fed-cloud07.mgmt.fedoraproject.org, !fed-cloud08.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         *, !proxy01, !proxy01, !proxy02, !proxy02, !proxy03, !proxy04, !proxy05, !proxy06, !proxy08, !proxy08, !proxy12, !proxy12, !proxy10, !proxy11, !proxy12, !fwsm01-gw, !backup01.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,!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,!bvirthost01.mgmt.fedoraproject.org,!virthost01.mgmt.fedoraproject.org,!virthost02.mgmt.fedoraproject.org,!virthost11.mgmt.fedoraproject.org,!virthost03.mgmt.fedoraproject.org,!virthost05.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,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org, !arm01-builder00, !arm01-retrace01, !arm01-builder02, !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-builder05, !arm02-builder06, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder15, !arm02-builder16, !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-builder18, !arm04-builder19, !arm04-builder20, !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-01, !buildvmhost-02, !buildvmhost-03, !buildvmhost-04, !buildvmhost-12, !cloud-gw, !fed-cloud03.mgmt.fedoraproject.org, !fed-cloud04.mgmt.fedoraproject.org, !fed-cloud05.mgmt.fedoraproject.org, !fed-cloud06.mgmt.fedoraproject.org, !fed-cloud07.mgmt.fedoraproject.org, !fed-cloud08.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/hosts/qa06-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/qa06-mgmt.cfg
index 441d4a0b0..fcd80f940 100644
--- a/roles/nagios/server/files/nagios/hosts/qa06-mgmt.cfg
+++ b/roles/nagios/server/files/nagios/hosts/qa06-mgmt.cfg
@@ -1,7 +1,7 @@
-define host {
-  host_name                    qa06.mgmt.fedoraproject.org
-  alias                        qa06.mgmt.fedoraproject.org
-  use                          mincheck
-  address                      qa06.mgmt.fedoraproject.org
-  parents                      fwsm01-gw
-}
+# define host {
+#   host_name                    qa06.mgmt.fedoraproject.org
+#   alias                        qa06.mgmt.fedoraproject.org
+#   use                          mincheck
+#   address                      qa06.mgmt.fedoraproject.org
+#   parents                      fwsm01-gw
+# }
diff --git a/roles/nagios/server/files/nagios/servicegroups/mgmt-http.cfg b/roles/nagios/server/files/nagios/servicegroups/mgmt-http.cfg
index 7e0e542c9..759caa29f 100644
--- a/roles/nagios/server/files/nagios/servicegroups/mgmt-http.cfg
+++ b/roles/nagios/server/files/nagios/servicegroups/mgmt-http.cfg
@@ -1,5 +1,5 @@
 define servicegroup {
     servicegroup_name   mgmt-http
     alias               mgmt interfaces on http
-    members 		backup01.mgmt.fedoraproject.org,backup01.mgmt.fedoraproject.org-http,bvirthost01.mgmt.fedoraproject.org,bvirthost01.mgmt.fedoraproject.org-http,download01.mgmt.fedoraproject.org,download01.mgmt.fedoraproject.org-http,download02.mgmt.fedoraproject.org,download02.mgmt.fedoraproject.org-http,download03.mgmt.fedoraproject.org,download03.mgmt.fedoraproject.org-http,download04.mgmt.fedoraproject.org,download04.mgmt.fedoraproject.org-http,download05.mgmt.fedoraproject.org,download05.mgmt.fedoraproject.org-http,qa01.mgmt.fedoraproject.org,qa01.mgmt.fedoraproject.org-http,qa02.mgmt.fedoraproject.org,qa02.mgmt.fedoraproject.org-http,qa03.mgmt.fedoraproject.org,qa03.mgmt.fedoraproject.org-http,qa04.mgmt.fedoraproject.org,qa04.mgmt.fedoraproject.org-http,qa05.mgmt.fedoraproject.org,qa05.mgmt.fedoraproject.org-http,qa06.mgmt.fedoraproject.org,qa06.mgmt.fedoraproject.org-http,qa07.mgmt.fedoraproject.org,qa07.mgmt.fedoraproject.org-http,qa08.mgmt.fedoraproject.org,qa08.mgmt.fedoraproject.org-http,qa09.mgmt.fedoraproject.org,qa09.mgmt.fedoraproject.org-http,qa10.mgmt.fedoraproject.org,qa10.mgmt.fedoraproject.org-http,qa11.mgmt.fedoraproject.org,qa11.mgmt.fedoraproject.org-http,qa12.mgmt.fedoraproject.org,qa12.mgmt.fedoraproject.org-http,qa13.mgmt.fedoraproject.org,qa13.mgmt.fedoraproject.org-http,qa14.mgmt.fedoraproject.org,qa14.mgmt.fedoraproject.org-http,virthost01.mgmt.fedoraproject.org,virthost01.mgmt.fedoraproject.org-http,virthost03.mgmt.fedoraproject.org,virthost03.mgmt.fedoraproject.org-http,virthost12.mgmt.fedoraproject.org,virthost12.mgmt.fedoraproject.org-http,virthost15.mgmt.fedoraproject.org,virthost15.mgmt.fedoraproject.org-http,virthost16.mgmt.fedoraproject.org,virthost16.mgmt.fedoraproject.org-http,virthost17.mgmt.fedoraproject.org,virthost17.mgmt.fedoraproject.org-http,virthost18.mgmt.fedoraproject.org,virthost18.mgmt.fedoraproject.org-http,virthost-comm02.mgmt.fedoraproject.org,virthost-comm02.mgmt.fedoraproject.org-http, virthost-comm03.mgmt.fedoraproject.org,virthost-comm03.mgmt.fedoraproject.org-http, virthost-comm04.mgmt.fedoraproject.org,virthost-comm04.mgmt.fedoraproject.org-http,virthost02.mgmt.fedoraproject.org,virthost02.mgmt.fedoraproject.org-http,virthost11.mgmt.fedoraproject.org,virthost11.mgmt.fedoraproject.org-http
+    members 		backup01.mgmt.fedoraproject.org,backup01.mgmt.fedoraproject.org-http,bvirthost01.mgmt.fedoraproject.org,bvirthost01.mgmt.fedoraproject.org-http,download01.mgmt.fedoraproject.org,download01.mgmt.fedoraproject.org-http,download02.mgmt.fedoraproject.org,download02.mgmt.fedoraproject.org-http,download03.mgmt.fedoraproject.org,download03.mgmt.fedoraproject.org-http,download04.mgmt.fedoraproject.org,download04.mgmt.fedoraproject.org-http,download05.mgmt.fedoraproject.org,download05.mgmt.fedoraproject.org-http,qa01.mgmt.fedoraproject.org,qa01.mgmt.fedoraproject.org-http,qa02.mgmt.fedoraproject.org,qa02.mgmt.fedoraproject.org-http,qa03.mgmt.fedoraproject.org,qa03.mgmt.fedoraproject.org-http,qa04.mgmt.fedoraproject.org,qa04.mgmt.fedoraproject.org-http,qa05.mgmt.fedoraproject.org,qa05.mgmt.fedoraproject.org-http,qa07.mgmt.fedoraproject.org,qa07.mgmt.fedoraproject.org-http,qa08.mgmt.fedoraproject.org,qa08.mgmt.fedoraproject.org-http,qa09.mgmt.fedoraproject.org,qa09.mgmt.fedoraproject.org-http,qa10.mgmt.fedoraproject.org,qa10.mgmt.fedoraproject.org-http,qa11.mgmt.fedoraproject.org,qa11.mgmt.fedoraproject.org-http,qa12.mgmt.fedoraproject.org,qa12.mgmt.fedoraproject.org-http,qa13.mgmt.fedoraproject.org,qa13.mgmt.fedoraproject.org-http,qa14.mgmt.fedoraproject.org,qa14.mgmt.fedoraproject.org-http,virthost01.mgmt.fedoraproject.org,virthost01.mgmt.fedoraproject.org-http,virthost03.mgmt.fedoraproject.org,virthost03.mgmt.fedoraproject.org-http,virthost12.mgmt.fedoraproject.org,virthost12.mgmt.fedoraproject.org-http,virthost15.mgmt.fedoraproject.org,virthost15.mgmt.fedoraproject.org-http,virthost16.mgmt.fedoraproject.org,virthost16.mgmt.fedoraproject.org-http,virthost17.mgmt.fedoraproject.org,virthost17.mgmt.fedoraproject.org-http,virthost18.mgmt.fedoraproject.org,virthost18.mgmt.fedoraproject.org-http,virthost-comm02.mgmt.fedoraproject.org,virthost-comm02.mgmt.fedoraproject.org-http, virthost-comm03.mgmt.fedoraproject.org,virthost-comm03.mgmt.fedoraproject.org-http, virthost-comm04.mgmt.fedoraproject.org,virthost-comm04.mgmt.fedoraproject.org-http,virthost02.mgmt.fedoraproject.org,virthost02.mgmt.fedoraproject.org-http,virthost11.mgmt.fedoraproject.org,virthost11.mgmt.fedoraproject.org-http
 }
diff --git a/roles/nagios/server/files/nagios/servicegroups/mgmt-https.cfg b/roles/nagios/server/files/nagios/servicegroups/mgmt-https.cfg
index 619f17742..4f395fbbc 100644
--- a/roles/nagios/server/files/nagios/servicegroups/mgmt-https.cfg
+++ b/roles/nagios/server/files/nagios/servicegroups/mgmt-https.cfg
@@ -1,5 +1,5 @@
 define servicegroup {
     servicegroup_name   mgmt-https
     alias               mgmt interfaces on https
-    members		backup01.mgmt.fedoraproject.org,backup01.mgmt.fedoraproject.org-https,bvirthost01.mgmt.fedoraproject.org,bvirthost01.mgmt.fedoraproject.org-https,download01.mgmt.fedoraproject.org,download01.mgmt.fedoraproject.org-https,download02.mgmt.fedoraproject.org,download02.mgmt.fedoraproject.org-https,download03.mgmt.fedoraproject.org,download03.mgmt.fedoraproject.org-https,download04.mgmt.fedoraproject.org,download04.mgmt.fedoraproject.org-https,download05.mgmt.fedoraproject.org,download05.mgmt.fedoraproject.org-https,qa01.mgmt.fedoraproject.org,qa01.mgmt.fedoraproject.org-https,qa02.mgmt.fedoraproject.org,qa02.mgmt.fedoraproject.org-https,qa03.mgmt.fedoraproject.org,qa03.mgmt.fedoraproject.org-https,qa04.mgmt.fedoraproject.org,qa04.mgmt.fedoraproject.org-https,qa05.mgmt.fedoraproject.org,qa05.mgmt.fedoraproject.org-https,qa06.mgmt.fedoraproject.org,qa06.mgmt.fedoraproject.org-https,qa07.mgmt.fedoraproject.org,qa07.mgmt.fedoraproject.org-https,qa08.mgmt.fedoraproject.org,qa08.mgmt.fedoraproject.org-https,qa09.mgmt.fedoraproject.org,qa09.mgmt.fedoraproject.org-https,qa10.mgmt.fedoraproject.org,qa10.mgmt.fedoraproject.org-https,qa11.mgmt.fedoraproject.org,qa11.mgmt.fedoraproject.org-https,qa12.mgmt.fedoraproject.org,qa12.mgmt.fedoraproject.org-https,qa13.mgmt.fedoraproject.org,qa13.mgmt.fedoraproject.org-https,qa14.mgmt.fedoraproject.org,qa14.mgmt.fedoraproject.org-https,virthost02.mgmt.fedoraproject.org,virthost02.mgmt.fedoraproject.org-https,virthost11.mgmt.fedoraproject.org,virthost11.mgmt.fedoraproject.org-https,virthost03.mgmt.fedoraproject.org,virthost03.mgmt.fedoraproject.org-https,virthost12.mgmt.fedoraproject.org,virthost12.mgmt.fedoraproject.org-https,virthost14.mgmt.fedoraproject.org,virthost14.mgmt.fedoraproject.org-https,virthost15.mgmt.fedoraproject.org,virthost15.mgmt.fedoraproject.org-https,virthost16.mgmt.fedoraproject.org,virthost16.mgmt.fedoraproject.org-https,virthost17.mgmt.fedoraproject.org,virthost17.mgmt.fedoraproject.org-https,virthost18.mgmt.fedoraproject.org,virthost18.mgmt.fedoraproject.org-https,virthost-comm02.mgmt.fedoraproject.org,virthost-comm02.mgmt.fedoraproject.org-https, virthost-comm03.mgmt.fedoraproject.org,virthost-comm03.mgmt.fedoraproject.org-https, virthost-comm04.mgmt.fedoraproject.org,virthost-comm04.mgmt.fedoraproject.org-https, sign-vault03.mgmt.fedoraproject.org,sign-vault03.mgmt.fedoraproject.org-https,sign-vault04.mgmt.fedoraproject.org,sign-vault04.mgmt.fedoraproject.org-https,fed-cloud09.mgmt.fedoraproject.org,fed-cloud09.mgmt.fedoraproject.org-https,fed-cloud08.mgmt.fedoraproject.org,fed-cloud08.mgmt.fedoraproject.org-https,fed-cloud10.mgmt.fedoraproject.org,fed-cloud10.mgmt.fedoraproject.org-https,fed-cloud11.mgmt.fedoraproject.org,fed-cloud11.mgmt.fedoraproject.org-https,fed-cloud12.mgmt.fedoraproject.org,fed-cloud12.mgmt.fedoraproject.org-https,fed-cloud13.mgmt.fedoraproject.org,fed-cloud13.mgmt.fedoraproject.org-https,fed-cloud14.mgmt.fedoraproject.org,fed-cloud14.mgmt.fedoraproject.org-https,fed-cloud15.mgmt.fedoraproject.org,fed-cloud15.mgmt.fedoraproject.org-https
+    members		backup01.mgmt.fedoraproject.org,backup01.mgmt.fedoraproject.org-https,bvirthost01.mgmt.fedoraproject.org,bvirthost01.mgmt.fedoraproject.org-https,download01.mgmt.fedoraproject.org,download01.mgmt.fedoraproject.org-https,download02.mgmt.fedoraproject.org,download02.mgmt.fedoraproject.org-https,download03.mgmt.fedoraproject.org,download03.mgmt.fedoraproject.org-https,download04.mgmt.fedoraproject.org,download04.mgmt.fedoraproject.org-https,download05.mgmt.fedoraproject.org,download05.mgmt.fedoraproject.org-https,qa01.mgmt.fedoraproject.org,qa01.mgmt.fedoraproject.org-https,qa02.mgmt.fedoraproject.org,qa02.mgmt.fedoraproject.org-https,qa03.mgmt.fedoraproject.org,qa03.mgmt.fedoraproject.org-https,qa04.mgmt.fedoraproject.org,qa04.mgmt.fedoraproject.org-https,qa05.mgmt.fedoraproject.org,qa05.mgmt.fedoraproject.org-https,qa07.mgmt.fedoraproject.org,qa07.mgmt.fedoraproject.org-https,qa08.mgmt.fedoraproject.org,qa08.mgmt.fedoraproject.org-https,qa09.mgmt.fedoraproject.org,qa09.mgmt.fedoraproject.org-https,qa10.mgmt.fedoraproject.org,qa10.mgmt.fedoraproject.org-https,qa11.mgmt.fedoraproject.org,qa11.mgmt.fedoraproject.org-https,qa12.mgmt.fedoraproject.org,qa12.mgmt.fedoraproject.org-https,qa13.mgmt.fedoraproject.org,qa13.mgmt.fedoraproject.org-https,qa14.mgmt.fedoraproject.org,qa14.mgmt.fedoraproject.org-https,virthost02.mgmt.fedoraproject.org,virthost02.mgmt.fedoraproject.org-https,virthost11.mgmt.fedoraproject.org,virthost11.mgmt.fedoraproject.org-https,virthost03.mgmt.fedoraproject.org,virthost03.mgmt.fedoraproject.org-https,virthost12.mgmt.fedoraproject.org,virthost12.mgmt.fedoraproject.org-https,virthost14.mgmt.fedoraproject.org,virthost14.mgmt.fedoraproject.org-https,virthost15.mgmt.fedoraproject.org,virthost15.mgmt.fedoraproject.org-https,virthost16.mgmt.fedoraproject.org,virthost16.mgmt.fedoraproject.org-https,virthost17.mgmt.fedoraproject.org,virthost17.mgmt.fedoraproject.org-https,virthost18.mgmt.fedoraproject.org,virthost18.mgmt.fedoraproject.org-https,virthost-comm02.mgmt.fedoraproject.org,virthost-comm02.mgmt.fedoraproject.org-https, virthost-comm03.mgmt.fedoraproject.org,virthost-comm03.mgmt.fedoraproject.org-https, virthost-comm04.mgmt.fedoraproject.org,virthost-comm04.mgmt.fedoraproject.org-https, sign-vault03.mgmt.fedoraproject.org,sign-vault03.mgmt.fedoraproject.org-https,sign-vault04.mgmt.fedoraproject.org,sign-vault04.mgmt.fedoraproject.org-https,fed-cloud09.mgmt.fedoraproject.org,fed-cloud09.mgmt.fedoraproject.org-https,fed-cloud08.mgmt.fedoraproject.org,fed-cloud08.mgmt.fedoraproject.org-https,fed-cloud10.mgmt.fedoraproject.org,fed-cloud10.mgmt.fedoraproject.org-https,fed-cloud11.mgmt.fedoraproject.org,fed-cloud11.mgmt.fedoraproject.org-https,fed-cloud12.mgmt.fedoraproject.org,fed-cloud12.mgmt.fedoraproject.org-https,fed-cloud13.mgmt.fedoraproject.org,fed-cloud13.mgmt.fedoraproject.org-https,fed-cloud14.mgmt.fedoraproject.org,fed-cloud14.mgmt.fedoraproject.org-https,fed-cloud15.mgmt.fedoraproject.org,fed-cloud15.mgmt.fedoraproject.org-https
 }
diff --git a/roles/nagios/server/files/nagios/services/mgmt.cfg b/roles/nagios/server/files/nagios/services/mgmt.cfg
index 84ff53cd0..f0afb56b9 100644
--- a/roles/nagios/server/files/nagios/services/mgmt.cfg
+++ b/roles/nagios/server/files/nagios/services/mgmt.cfg
@@ -113,13 +113,6 @@ define service {
 }
 
 define service {
-  host_name             qa06.mgmt.fedoraproject.org
-  service_description   qa06.mgmt.fedoraproject.org-http
-  check_command         check_http!qa06.mgmt.fedoraproject.org
-  use                   defaulttemplate
-}
-
-define service {
   host_name             qa07.mgmt.fedoraproject.org
   service_description   qa07.mgmt.fedoraproject.org-http
   check_command         check_http!qa07.mgmt.fedoraproject.org
@@ -396,13 +389,6 @@ define service {
 }
 
 define service {
-  host_name             qa06.mgmt.fedoraproject.org
-  service_description   qa06.mgmt.fedoraproject.org-https
-  check_command         check_https!qa06.mgmt.fedoraproject.org
-  use                   defaulttemplate
-}
-
-define service {
   host_name             qa07.mgmt.fedoraproject.org
   service_description   qa07.mgmt.fedoraproject.org-https
   check_command         check_https!qa07.mgmt.fedoraproject.org