From 9a062828b98de8c542f943a2c6da1b1b33ae79b1 Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Tue, 10 Jan 2017 22:58:42 +0000
Subject: [PATCH] and we have a set of hosts

---
 .../noc01.stg.phx2.fedoraproject.org          | 22 +++++++++----------
 roles/nagios_server/tasks/main.yml            |  4 ----
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/inventory/host_vars/noc01.stg.phx2.fedoraproject.org b/inventory/host_vars/noc01.stg.phx2.fedoraproject.org
index 52389e115c..7efe8a0770 100644
--- a/inventory/host_vars/noc01.stg.phx2.fedoraproject.org
+++ b/inventory/host_vars/noc01.stg.phx2.fedoraproject.org
@@ -40,7 +40,6 @@ phx2_management_hosts:
   - beaker-client01.mgmt.fedoraproject.org
   - beaker-client02.mgmt.fedoraproject.org
   - bvirthost01.mgmt.fedoraproject.org
-  - cloud-eql02.mgmt.fedoraproject.org
   - cosmos01.mgmt.fedoraproject.org
   - data-analysis01.mgmt.fedoraproject.org
   - dell-fx01.mgmt.fedoraproject.org
@@ -89,15 +88,7 @@ phx2_management_hosts:
   - qa12.mgmt.fedoraproject.org
   - qa13.mgmt.fedoraproject.org
   - qa14.mgmt.fedoraproject.org
-  - rack16-pdu-a.mgmt.fedoraproject.org
-  - rack16-pdu-b.mgmt.fedoraproject.org
-  - rack17-pdu-a.mgmt.fedoraproject.org
-  - rack17-pdu-b.mgmt.fedoraproject.org
-  - rack46-pdu-a.mgmt.fedoraproject.org
-  - rack46-pdu-b.mgmt.fedoraproject.org
-  - rack47-pdu-a.mgmt.fedoraproject.org
   - rack47-serial.mgmt.fedoraproject.org
-  - rack48-pdu-a.mgmt.fedoraproject.org
   - rack48-serial.mgmt.fedoraproject.org
   - rack50-serial.mgmt.fedoraproject.org
   - rack51-serial.mgmt.fedoraproject.org
@@ -126,13 +117,12 @@ phx2_management_hosts:
   - virthost21.mgmt.fedoraproject.org
   - virthost22.mgmt.fedoraproject.org
 #  - ppc8-04-fsp.mgmt.fedoraproject.org
-#  - rack47-pdu-b.mgmt.fedoraproject.org
-#  - rack48-pdu-b.mgmt.fedoraproject.org
 
   
 phx2_management_limited:
   - bkernel01.mgmt.fedoraproject.org
   - bkernel02.mgmt.fedoraproject.org
+  - cloud-eql02.mgmt.fedoraproject.org
   - fed-cloud-ppc01.mgmt.fedoraproject.org
   - fed-cloud-ppc02.mgmt.fedoraproject.org
   - moonshot01-ilo.mgmt.fedoraproject.org
@@ -151,8 +141,18 @@ phx2_management_limited:
   - qa06.mgmt.fedoraproject.org
   - qa07.mgmt.fedoraproject.org
   - qa08.mgmt.fedoraproject.org
+  - rack16-pdu-a.mgmt.fedoraproject.org
+  - rack16-pdu-b.mgmt.fedoraproject.org
+  - rack17-pdu-a.mgmt.fedoraproject.org
+  - rack17-pdu-b.mgmt.fedoraproject.org
+  - rack46-pdu-a.mgmt.fedoraproject.org
+  - rack46-pdu-b.mgmt.fedoraproject.org
+  - rack47-pdu-a.mgmt.fedoraproject.org
+  - rack48-pdu-a.mgmt.fedoraproject.org
   - sign-vault03.mgmt.fedoraproject.org
   - sign-vault04.mgmt.fedoraproject.org
   - virthost-comm02.mgmt.fedoraproject.org
   - virthost12.mgmt.fedoraproject.org
   - virthost14.mgmt.fedoraproject.org
+#  - rack47-pdu-b.mgmt.fedoraproject.org
+#  - rack48-pdu-b.mgmt.fedoraproject.org
diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index e3b6275d30..897a3402e0 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -195,12 +195,8 @@
 - name: Copy /etc/nagios/services (staging)
   copy: src=nagios/services/{{ item }} dest=/etc/nagios/services/{{ item }}
   with_items:
-    - disk.cfg
     - mail_queue.cfg
     - ping.cfg
-    - procs.cfg
-    - raid.cfg
-    - ssh.cfg
     - templates.cfg
   tags:
   - nagios-config