From 23a347c8ecb196c5c38f0574b867e98bfcacfb3d Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Tue, 2 May 2017 00:35:05 +0000
Subject: [PATCH] make our list a little smaller

---
 inventory/inventory                                           | 4 ++--
 roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 | 2 +-
 roles/nagios_server/templates/nagios/hostgroups/noswap.cfg.j2 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/inventory/inventory b/inventory/inventory
index 047f878526..58277ed8c7 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -139,7 +139,7 @@ osuosl01.fedoraproject.org
 osuosl02.fedoraproject.org
 osuosl03.fedoraproject.org
 tummy01.fedoraproject.org
-virthost-rdu01.fedoraproject.org
+#virthost-rdu01.fedoraproject.org
 virthost-cc-rdu01.fedoraproject.org
 
 [datagrepper]
@@ -634,7 +634,7 @@ proxy09.fedoraproject.org
 proxy10.phx2.fedoraproject.org
 proxy11.fedoraproject.org
 proxy12.fedoraproject.org
-proxy13.fedoraproject.org
+#proxy13.fedoraproject.org
 proxy14.fedoraproject.org
 
 [proxies-stg]
diff --git a/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2
index 47857f983d..d726c2c49b 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2
@@ -1,6 +1,6 @@
 define hostgroup {
         hostgroup_name  nomail
         alias           No Mail
-	members         *, !status-fedora2, !phx2-gw, !ibiblio-gw, !cloud-gw, !bodhost-gw, !coloamer-gw, !dedicated-gw, !host1plus-gw, !internetx-gw, !osuosl-gw, !rdu-gw, !rdu-cc-gw, !tummy-gw, {% for host in groups['bastion'] %}!{{host}}, {% endfor %}{% for host in groups['smtp-mm'] %}!{{host}}, {% endfor %} {% for host in groups['builders'] %}!{{host}},{% endfor %} {% for host in groups['builders-stg'] %}!{{host}},{% endfor %} {% for host in groups['cloud'] %}!{{host}}, {% endfor %} {% for host in vars['phx2_management_limited'] %}!{{host}},{% endfor %}  {% for host in vars['phx2_management_hosts'] %}!{{host}}{% if not loop.last %},{% endif %} {% endfor %} 
+	members         *, !status-fedora2, !phx2-gw, !ibiblio-gw, !cloud-gw, !bodhost-gw, !coloamer-gw, !dedicated-gw, !host1plus-gw, !internetx-gw, !osuosl-gw, !rdu-gw, !rdu-cc-gw, !tummy-gw, !hosted03.fedoraproject.org, {% for host in groups['bastion'] %}!{{host}}, {% endfor %}{% for host in groups['smtp-mm'] %}!{{host}}, {% endfor %} {% for host in groups['builders'] %}!{{host}},{% endfor %} {% for host in groups['builders-stg'] %}!{{host}},{% endfor %} {% for host in groups['cloud'] %}!{{host}}, {% endfor %} {% for host in vars['phx2_management_limited'] %}!{{host}},{% endfor %}  {% for host in vars['phx2_management_hosts'] %}!{{host}}{% if not loop.last %},{% endif %} {% endfor %} 
 
 }
diff --git a/roles/nagios_server/templates/nagios/hostgroups/noswap.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/noswap.cfg.j2
index 1399aa171d..6fae7a260d 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/noswap.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/noswap.cfg.j2
@@ -1,6 +1,6 @@
 define hostgroup {
         hostgroup_name  noswap
         alias           No Swap
-	members         *, !status-fedora2, !phx2-gw, !ibiblio-gw, !cloud-gw, !bodhost-gw, !coloamer-gw, !dedicated-gw, !host1plus-gw, !internetx-gw, !osuosl-gw, !rdu-gw, !rdu-cc-gw, !tummy-gw, {% for host in groups['builders'] %}!{{host}},{% endfor %} {% for host in groups['builders-stg'] %}!{{host}},{% endfor %} {% for host in groups['cloud'] %}!{{host}}, {% endfor %} {% for host in vars['phx2_management_limited'] %}!{{host}},{% endfor %}  {% for host in vars['phx2_management_hosts'] %}!{{host}}{% if not loop.last %},{% endif %} {% endfor %} 
+	members         *, !status-fedora2, !phx2-gw, !ibiblio-gw, !cloud-gw, !bodhost-gw, !coloamer-gw, !dedicated-gw, !host1plus-gw, !internetx-gw, !osuosl-gw, !rdu-gw, !rdu-cc-gw, !tummy-gw, !proxy05.fedoraproject.org, !mirrorlist-host1plus.fedoraproject.org, !hosted03.fedoraproject.org, !download-rdu01.fedoraproject.org, {% for host in groups['builders'] %}!{{host}},{% endfor %} {% for host in groups['builders-stg'] %}!{{host}},{% endfor %} {% for host in groups['cloud'] %}!{{host}}, {% endfor %} {% for host in vars['phx2_management_limited'] %}!{{host}},{% endfor %}  {% for host in vars['phx2_management_hosts'] %}!{{host}}{% if not loop.last %},{% endif %} {% endfor %} 
 
 }