From b8b8155e52451e6b1523eeb0941a0f9057cc2b19 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Tue, 10 Jan 2017 17:23:39 +0000 Subject: [PATCH] ok I cant see what the f is wrong so we are undoing each loop until it breaks --- .../templates/nagios/hostgroups/all.cfg.j2 | 42 ------------------- 1 file changed, 42 deletions(-) diff --git a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 index 89b4b3e40a..1ca50beadd 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 @@ -3,10 +3,6 @@ ############### ## {{ env }} -{% if env == "staging" %} -{% for key, value in groups.iteritems() %} -{% if groups[key] %} - define hostgroup{ hostgroup_name {{ key }} alias {{ key }} @@ -14,41 +10,3 @@ define hostgroup{ } -{% endif %} -{% endfor %} - -{% else %} - -{% for key, value in groups.iteritems() %} -{% if groups[key] %} -define hostgroup{ - hostgroup_name {{ key }} - alias {{ key }} - members {% for host in groups[key] %}{{host}}, {% endfor %} - -} -{% endfor %} - - -{% endif %} - -## -## Management hardware -define hostgroup { - hostgroup_name phx2_mgmt_systems - alias phx2_mgmt_systems - members {% for host in vars['phx2_management_hosts'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -{% if env != "staging" %} -## -## VPN clients -define hostgroup { - hostgroup_name vpnclients - alias vpnclients - members {% for host in groups['all'] %}{% if hostvars[host].vpn %}{{host}},{% endif %} {% endfor %} - -} - -{% endif %}