From 4287f517df82a224d5580d1ae54e0ae18e5e5649 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Mon, 1 May 2017 20:51:49 +0000 Subject: [PATCH] and we need to cover our two vars --- roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 | 2 +- roles/nagios_server/templates/nagios/hostgroups/noswap.cfg.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 index b40bf70ce7..68c974d537 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 *, {% 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 vars['phx2_management_hosts'] %}!{{host}}{% if not loop.last %},{% endif %} {% endfor %} + members *, {% 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 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 b71ef72004..4ee355874f 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 *,{% for host in vars['phx2_management_hosts'] %}!{{host}}, {%endfor %}{% for host in groups['twisted-buildbots'] %}!{{host}}, {% endfor %}{% for host in groups['persistent-cloud'] %}!{{host}}, {% endfor %}{% for host in groups['copr-dist-git'] %}!{{host}}, {% endfor %}{% for host in groups['jenkins-master'] %}!{{host}}, {% endfor %}{% for host in groups['maintainer-test'] %}!{{host}}, {% endfor %}{% for host in groups['copr'] %}!{{host}}, {% endfor %}{% for host in groups['copr-dist-git-stg'] %}!{{host}}, {% endfor %}{% for host in groups['jenkins-slave'] %}!{{host}}, {% endfor %}{% for host in groups['ipsilon-dev'] %}!{{host}}, {% endfor %}{% for host in groups['copr-stg'] %}!{{host}} {% if not loop.last %},{% endif %} {% endfor %} + members *, {% for host in vars['phx2_management_hosts'] %}!{{host}}, {%endfor %} {% for host in vars['phx2_management_limited'] %}!{{host}}, {%endfor %}{% for host in groups['twisted-buildbots'] %}!{{host}}, {% endfor %}{% for host in groups['persistent-cloud'] %}!{{host}}, {% endfor %}{% for host in groups['copr-dist-git'] %}!{{host}}, {% endfor %}{% for host in groups['jenkins-master'] %}!{{host}}, {% endfor %}{% for host in groups['maintainer-test'] %}!{{host}}, {% endfor %}{% for host in groups['copr'] %}!{{host}}, {% endfor %}{% for host in groups['copr-dist-git-stg'] %}!{{host}}, {% endfor %}{% for host in groups['jenkins-slave'] %}!{{host}}, {% endfor %}{% for host in groups['ipsilon-dev'] %}!{{host}}, {% endfor %}{% for host in groups['copr-stg'] %}!{{host}} {% if not loop.last %},{% endif %} {% endfor %} }