summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Smoogen <smooge@redhat.com>2017-05-01 20:27:24 +0000
committerStephen Smoogen <smooge@redhat.com>2017-05-01 20:27:24 +0000
commit916afb24dbb007dbe1f027368f636d9585ca88b6 (patch)
treee868b1cb4ab59f84b8f60b652148a7c6932b19b6
parent6513b8a895a2844c04cef736a999c524a314f454 (diff)
downloadansible-916afb24dbb007dbe1f027368f636d9585ca88b6.tar.gz
ansible-916afb24dbb007dbe1f027368f636d9585ca88b6.tar.xz
ansible-916afb24dbb007dbe1f027368f636d9585ca88b6.zip
and we try to make a template where this doesnt kill us
-rw-r--r--roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j22
-rw-r--r--roles/nagios_server/templates/nagios/hostgroups/noswap.cfg.j22
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 06c7b2cc5..1cf37e709 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 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 vars['builders'] %}!{{host}},{% endfor %} {% for host in vars['builders-stg'] %}!{{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 871b68562..b71ef7200 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 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 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 %}
}