put in tests to remove nagios from trying to talk to iad2 boxes

inventory/group_vars/nagios

@@ -130,6 +130,9 @@ phx2_external:
   - secondary01.fedoraproject.org
   - stg.fedoraproject.org
 
+iad2_external:
+  - proxy-iad01.fedoraproject.org
+
 # When you have a group which comes up with empty members in all.cfg, it
 # is because it contains all hosts which aren't pinganble. You may want
 # to add that group to this list. Other items on this list are ones

roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2

@@ -121,3 +121,19 @@ define host {
 {% endif %}
 
 }
+
+#'iad2'
+define host {
+  host_name                    iad2-gw
+  alias                        iad2 cage gateway
+  use                          mincheck
+  check_command                check-host-alive4
+  address                      209.132.185.254
+{% if vars['nagios_location'] == 'internal' %}
+  parents                      phx2-gw
+{% else %}
+  parents                      ibiblio-gw
+{% endif %}
+
+}
+

roles/nagios_server/templates/nagios/hosts/iad2-external.cfg.j2

@@ -0,0 +1,9 @@
+{% for host in vars["iad2_external"]|sort %}
+define host {
+  host_name               {{ host }}
+  alias                   {{ host }}
+  use                     mincheck
+  address                 {{ host }}
+  parents                 iad2-gw
+}
+{% endfor %}

roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2

@@ -1,6 +1,6 @@
 define servicegroup {
     servicegroup_name   bodhi
     alias               Bodhi
-    members             {% for host in groups['proxies'] %}{{host}}, http-bodhi2  {% if not loop.last %} , {% endif %} {% endfor %}
+    members             {% for host in groups['proxies']|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-bodhi2 {% if not loop.last %} , {% endif %}{% endif %} {% endfor %}
 
 }

roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2

@@ -1,6 +1,6 @@
 define servicegroup {
     servicegroup_name   fas
     alias               Fedora Account System
-    members         {% for host in groups['proxies'] %}{{host}}, http-accounts, {% endfor %}{% for host in groups['fas'] %}{{host}}, http-accounts, {% endfor %} db-fas01.phx2.fedoraproject.org,Check FAS DB
+    members         {% for host in groups['proxies']|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-accounts, {% endif %}{% endfor %}{% for host in groups['fas'] %}{{host}}, http-accounts, {% endfor %} db-fas01.phx2.fedoraproject.org,Check FAS DB
 
 }

roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2

@@ -1,7 +1,7 @@
 define servicegroup {
     servicegroup_name   fp-wiki
     alias               Fedora Project Wiki
-    members             {% for host in groups['proxies'] %}{{host}}, http-fedoraproject.org-wiki , {% endfor %}{% for host in groups['proxies'] %}{{host}}, http-fedoraproject.org-wiki-non-cached  {% if not loop.last %} , {% endif %} {% endfor %}
+    members             {% for host in groups['proxies']|sort  %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}},  http-fedoraproject.org-wiki , {% endfor %}{% for host in groups['proxies'|sort] %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-fedoraproject.org-wiki-non-cached  {% if not loop.last %} , {% endif %} {% endif %}{% endfor %}
 
 }
 

roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2

@@ -1,7 +1,7 @@
 define servicegroup {
     servicegroup_name   mirrorlist
     alias               Mirrorlist
-    members             {% for host in groups['proxies'] %}{{host}}, http-mirrors.fedoraproject.org-mirrorlist {% if not loop.last %} , {% endif %} {% endfor %}
+    members             {% for host in groups['proxies']|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-mirrors.fedoraproject.org-mirrorlist{% if not loop.last %} , {% endif %}{% endif %} {% endfor %}
 
 }