From 790142447078141030204f8be389399580c45c4c Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Sun, 8 Jan 2017 22:09:05 +0000 Subject: [PATCH] when doing templates you need to have a clear line after a foreach --- .../templates/nagios/hostgroups/ask.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/autocloud.cfg.j2 | 8 ++++++++ .../templates/nagios/hostgroups/autosign.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/backup.cfg.j2 | 1 + .../templates/nagios/hostgroups/badges.cfg.j2 | 4 ++++ .../templates/nagios/hostgroups/basset.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/bastion.cfg.j2 | 1 + .../templates/nagios/hostgroups/batcave.cfg.j2 | 1 + .../templates/nagios/hostgroups/beaker.cfg.j2 | 3 +++ .../templates/nagios/hostgroups/blockerbugs.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/bodhi.cfg.j2 | 4 ++++ .../templates/nagios/hostgroups/bug2fedmsg.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/bugyou.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/build-x86.cfg.j2 | 4 ++++ .../templates/nagios/hostgroups/buildaarch64.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/buildarm.cfg.j2 | 8 ++++++++ .../templates/nagios/hostgroups/builders.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/buildppc.cfg.j2 | 5 +++++ .../templates/nagios/hostgroups/builds390.cfg.j2 | 1 + .../templates/nagios/hostgroups/busgateway.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/copr.cfg.j2 | 10 ++++++++++ .../templates/nagios/hostgroups/darkserver.cfg.j2 | 3 +++ .../templates/nagios/hostgroups/datagrepper.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/dbserver.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/dhcp.cfg.j2 | 1 + .../templates/nagios/hostgroups/docker.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/download.cfg.j2 | 3 +++ .../templates/nagios/hostgroups/elections.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/fedimg.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/fedmsg.cfg.j2 | 12 ++++++++++++ .../templates/nagios/hostgroups/fedocal.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/github2fedmsg.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/hosted.cfg.j2 | 1 + .../templates/nagios/hostgroups/hotness.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/infinote.cfg.j2 | 1 + .../templates/nagios/hostgroups/ipa.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/ipsilon.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/jenkins.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/kernel.cfg.j2 | 3 +++ .../templates/nagios/hostgroups/koji.cfg.j2 | 3 +++ .../templates/nagios/hostgroups/koschei.cfg.j2 | 4 ++++ .../templates/nagios/hostgroups/mailman.cfg.j2 | 3 +++ .../templates/nagios/hostgroups/mdapi.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/memcached.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/mirroring.cfg.j2 | 8 ++++++++ .../templates/nagios/hostgroups/modernpaste.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/moksha.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/notifs.cfg.j2 | 4 ++++ .../templates/nagios/hostgroups/nuancier.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/openqa.cfg.j2 | 3 +++ .../templates/nagios/hostgroups/osbs.cfg.j2 | 6 ++++++ .../templates/nagios/hostgroups/packages.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/pagure.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/paste.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/pdc.cfg.j2 | 4 ++++ .../templates/nagios/hostgroups/people.cfg.j2 | 1 + .../templates/nagios/hostgroups/pgbdr.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/pkgdb.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/pkgs.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/releng.cfg.j2 | 3 +++ .../nagios/hostgroups/relvalconsumer.cfg.j2 | 1 + .../templates/nagios/hostgroups/resultsdb.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/statscache.cfg.j2 | 4 ++++ .../templates/nagios/hostgroups/summershum.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/sundries.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/tagger.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/taskotron.cfg.j2 | 1 + .../templates/nagios/hostgroups/torrent.cfg.j2 | 1 + .../templates/nagios/hostgroups/unbound.cfg.j2 | 1 + .../templates/nagios/hostgroups/value.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/vpnclients.cfg.j2 | 1 + .../templates/nagios/hostgroups/web.cfg.j2 | 1 + .../templates/nagios/hostgroups/wiki.cfg.j2 | 2 ++ .../templates/nagios/hostgroups/zanata2fedmsg.cfg.j2 | 2 ++ 74 files changed, 199 insertions(+) diff --git a/roles/nagios_server/templates/nagios/hostgroups/ask.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/ask.cfg.j2 index 2c1e3664b6..d749310bcd 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/ask.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/ask.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name ask alias ASK servers members {% for host in groups['ask'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name ask-stg alias STG ASK servers members {% for host in groups['ask-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/autocloud.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/autocloud.cfg.j2 index 3e1fff9bab..d26775a620 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/autocloud.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/autocloud.cfg.j2 @@ -2,48 +2,56 @@ define hostgroup { hostgroup_name autocloud-backend-libvirt alias Autocloud Backend Libvirt servers members {% for host in groups['autocloud-backend-libvirt'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name autocloud-backend-libvirt-stg alias STG Autocloud Backend Libvirt servers members {% for host in groups['autocloud-backend-libvirt-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name autocloud-backend-vbox alias Autocloud Backend VBOX servers members {% for host in groups['autocloud-backend-vbox'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name autocloud-backend-vbox-stg alias STG Autocloud Backend Vbox servers members {% for host in groups['autocloud-backend-vbox-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name autocloud-backend alias Autocloud Backend members {% for host in groups['autocloud-backend'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name autocloud-backend-stg alias STG Autocloud Backend servers members {% for host in groups['autocloud-backend-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name autocloud-web alias Autocloud Web members {% for host in groups['autocloud-web'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name autocloud-web-stg alias STG Autocloud Web servers members {% for host in groups['autocloud-web-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/autosign.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/autosign.cfg.j2 index af62ec57d4..19bbf3c1a1 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/autosign.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/autosign.cfg.j2 @@ -2,10 +2,12 @@ define hostgroup { hostgroup_name autosign alias AUTOSIGN servers members {% for host in groups['autosign'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name autosign-stg alias STG AUTOSIGN servers members {% for host in groups['autosign-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/backup.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/backup.cfg.j2 index 0003afc507..6c380b6eaf 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/backup.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/backup.cfg.j2 @@ -2,5 +2,6 @@ define hostgroup { hostgroup_name backup alias backup servers members {% for host in groups['backup'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/badges.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/badges.cfg.j2 index 4617fd95e2..988f29dbaf 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/badges.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/badges.cfg.j2 @@ -2,22 +2,26 @@ define hostgroup { hostgroup_name badges-backend alias Badges Backend members {% for host in groups['badges-backend'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name badges-web alias Badges Web members {% for host in groups['badges-web'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name badges-backend-stg alias STG Badges Backend members {% for host in groups['badges-backend'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name badges-web-stg alias STG Badges Web members {% for host in groups['badges-web'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/basset.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/basset.cfg.j2 index f5f903ee6c..677b65b13e 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/basset.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/basset.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name basset alias Basset members {% for host in groups['basset'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name basset-stg alias STG Basset members {% for host in groups['basset-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/bastion.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/bastion.cfg.j2 index c33d590865..000f439d03 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/bastion.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/bastion.cfg.j2 @@ -2,5 +2,6 @@ define hostgroup { hostgroup_name bastions alias Bastion Servers members {% for host in groups['bastion'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/batcave.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/batcave.cfg.j2 index 1554d1f927..74452b6d96 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/batcave.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/batcave.cfg.j2 @@ -2,4 +2,5 @@ define hostgroup { hostgroup_name batcave alias batcave servers members {% for host in groups['batcave'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/beaker.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/beaker.cfg.j2 index aa9c1dd780..4ac7db9a05 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/beaker.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/beaker.cfg.j2 @@ -2,17 +2,20 @@ define hostgroup { hostgroup_name beaker alias beaker members {% for host in groups['beaker'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name beaker-stg alias STG beaker members {% for host in groups['beaker-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name beaker-virthosts alias beaker virthosts members {% for host in groups['beaker-virthosts'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/blockerbugs.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/blockerbugs.cfg.j2 index b1355b144d..d5582720a6 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/blockerbugs.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/blockerbugs.cfg.j2 @@ -2,10 +2,12 @@ define hostgroup { hostgroup_name blockerbugs alias Blocker Bugs servers members {% for host in groups['blockerbugs'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name blockerbugs-stg alias STG Blocker Bugs servers members {% for host in groups['blockerbugs-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/bodhi.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/bodhi.cfg.j2 index fb6c2773f9..dcb2ad874e 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/bodhi.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/bodhi.cfg.j2 @@ -2,22 +2,26 @@ define hostgroup { hostgroup_name bodhi2 alias Bodhi2 members {% for host in groups['bodhi2'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name bodhi2-stg alias STG Bodhi2 members {% for host in groups['bodhi2-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name bodhi-backend alias Bodhi Backend members {% for host in groups['bodhi-backend'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name bodhi2-backend-stg alias STG Bodhi Backend members {% for host in groups['bodhi-backend-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/bug2fedmsg.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/bug2fedmsg.cfg.j2 index 91a1806293..061b6e64a8 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/bug2fedmsg.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/bug2fedmsg.cfg.j2 @@ -2,10 +2,12 @@ define hostgroup { hostgroup_name bugzilla2fedmsg alias BUGZILLA2FEDMSG servers members {% for host in groups['bugzilla2fedmsg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name bugzilla2fedmsg-stg alias STG BUGZILLA2FEDMSG servers members {% for host in groups['bugzilla2fedmsg-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/bugyou.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/bugyou.cfg.j2 index 739a305531..8ffd6e6c59 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/bugyou.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/bugyou.cfg.j2 @@ -2,10 +2,12 @@ define hostgroup { hostgroup_name bugyou alias Bug You members {% for host in groups['bugyou'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name bugyou-stg alias STG Bug You members {% for host in groups['bugyou-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/build-x86.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/build-x86.cfg.j2 index 7034e03615..56ff220560 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/build-x86.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/build-x86.cfg.j2 @@ -2,6 +2,7 @@ define hostgroup { hostgroup_name buildhw alias Build x86 HW members {% for host in groups['buildhw'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } @@ -9,6 +10,7 @@ define hostgroup { hostgroup_name bkernel alias Build Kernel x86 HW members {% for host in groups['bkernel'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } @@ -16,12 +18,14 @@ define hostgroup { hostgroup_name buildvm alias Build Virtual Machines members {% for host in groups['buildvm'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name buildvm-stg alias STG Build Virtual Machines members {% for host in groups['buildvm-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/buildaarch64.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/buildaarch64.cfg.j2 index 084a265b87..95ece983f8 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/buildaarch64.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/buildaarch64.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name buildvm-aarch64 alias buildvm-aarch64 members {% for host in groups['buildvm-aarch64'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name build-aarch64 alias build-aarch64 members {% for host in groups['buildaarch64'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/buildarm.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/buildarm.cfg.j2 index 934507f615..d76f45d635 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/buildarm.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/buildarm.cfg.j2 @@ -2,6 +2,7 @@ define hostgroup { hostgroup_name arm-packager alias ARM packagers members {% for host in groups['arm-packager'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } @@ -9,30 +10,35 @@ define hostgroup { hostgroup_name arm-qa alias ARM qa members {% for host in groups['arm-qa'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name arm01 alias ARM 01 builders members {% for host in groups['arm01'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name arm02 alias ARM 02 builders members {% for host in groups['arm02'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name arm03 alias ARM 03 builders members {% for host in groups['arm03'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name arm04 alias ARM04 members {% for host in groups['arm04'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } @@ -40,12 +46,14 @@ define hostgroup { hostgroup_name buildarm alias Builders for ARM members {% for host in groups['buildarm'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name buildarm-stg alias STG Builders for ARM members {% for host in groups['buildarm-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/builders.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/builders.cfg.j2 index 31c904db4e..89b7e1175e 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/builders.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/builders.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name bvirthost alias Builder Virthost servers members {% for host in groups['bvirthost'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name buildvmhost alias KVM servers for builders members {% for host in groups['buildvmhost'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/buildppc.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/buildppc.cfg.j2 index a766442618..011ca0ebb3 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/buildppc.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/buildppc.cfg.j2 @@ -2,29 +2,34 @@ define hostgroup { hostgroup_name buildppc alias PPC secondary Hosts members {% for host in groups['buildppc'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name buildppcle alias PPC LE secondary Hosts members {% for host in groups['buildppcle'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name buildppc64 alias PPC64 secondary Hosts members {% for host in groups['buildppc64'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name buildvm-ppc64 alias PPC 64 VM secondary Hosts members {% for host in groups['buildvm-ppc64'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name buildvm-ppc64le alias PPC 64 LE VM secondary Hosts members {% for host in groups['buildvm-ppc64le'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/builds390.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/builds390.cfg.j2 index 4dbf3da433..a7aad8dd2c 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/builds390.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/builds390.cfg.j2 @@ -2,4 +2,5 @@ define hostgroup { hostgroup_name buildvm-s390 alias Build servers s390 members {% for host in groups['buildvm-s390'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/busgateway.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/busgateway.cfg.j2 index 9cc8950fca..9c9b5a6ab0 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/busgateway.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/busgateway.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name bustgateway alias BUSTGATEWAY servers members {% for host in groups['busgateway'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name bustgateway-stg alias STG BUSTGATEWAY servers members {% for host in groups['busgateway-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/copr.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/copr.cfg.j2 index d223f0550b..59aad9c74c 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/copr.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/copr.cfg.j2 @@ -2,59 +2,69 @@ define hostgroup { hostgroup_name copr-back alias COPR-BACK servers members {% for host in groups['copr-back'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name copr-back-stg alias STG COPR-BACK servers members {% for host in groups['copr-back-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name copr-dist-git alias COPR-DIST-GIT servers members {% for host in groups['copr-dist-git'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name copr-dist-git-stg alias STG COPR-DIST-GIT servers members {% for host in groups['copr-dist-git-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name copr-front alias COPR-FRONT servers members {% for host in groups['copr-front'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name copr-front-stg alias STG COPR-FRONT servers members {% for host in groups['copr-front-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name copr-keygen alias COPR-KEYGEN servers members {% for host in groups['copr-keygen'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name copr-keygen-stg alias STG COPR-KEYGEN servers members {% for host in groups['copr-keygen-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name copr alias Copr servers members {% for host in groups['copr'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name copr-stg alias STG Copr servers members {% for host in groups['copr-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/darkserver.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/darkserver.cfg.j2 index 882a675634..394bd299bf 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/darkserver.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/darkserver.cfg.j2 @@ -2,17 +2,20 @@ define hostgroup { hostgroup_name darkserver alias DARKSERVER servers members {% for host in groups['darkserver'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name darkserver-backend-stg alias STG DARKSERVER Backend servers members {% for host in groups['darkserver-backend-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name darkserver-web-stg alias STG DARKSERVER WEB servers members {% for host in groups['darkserver-web-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/datagrepper.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/datagrepper.cfg.j2 index 75d6300f88..a1c94a1764 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/datagrepper.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/datagrepper.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name datagrepper alias DATAGREPPER servers members {% for host in groups['datagrepper'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name datagrepper-stg alias STG DATAGREPPER servers members {% for host in groups['datagrepper-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/dbserver.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/dbserver.cfg.j2 index f8c8421327..1d79a36107 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/dbserver.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/dbserver.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name dbserver alias DBSERVER servers members {% for host in groups['dbserver'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name dbserver-stg alias STG DBSERVER servers members {% for host in groups['dbserver-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/dhcp.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/dhcp.cfg.j2 index 4431734217..811fcd24c1 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/dhcp.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/dhcp.cfg.j2 @@ -2,5 +2,6 @@ define hostgroup { hostgroup_name dhcp alias DHCP servers members {% for host in groups['dhcp'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/docker.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/docker.cfg.j2 index cebc90c39a..bd7e0806ab 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/docker.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/docker.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name docker-registry alias DOCKER-REGISTRY servers members {% for host in groups['docker-registry'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name docker-registry-stg alias STG DOCKER-REGISTRY servers members {% for host in groups['docker-registry-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/download.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/download.cfg.j2 index 79eae7db45..91d7b04b45 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/download.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/download.cfg.j2 @@ -2,16 +2,19 @@ define hostgroup { hostgroup_name download-ibiblio alias Download ibiblio servers members {% for host in groups['download-ibiblio'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name download-phx2 alias Download PHX2 servers members {% for host in groups['download-phx2'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name download-rdu2 alias Download RDU2 servers members {% for host in groups['download-rdu2'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/elections.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/elections.cfg.j2 index 17d7bee2cd..ef7bca9b23 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/elections.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/elections.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name elections alias ELECTIONS servers members {% for host in groups['elections'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name elections-stg alias STG ELECTIONS servers members {% for host in groups['elections-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/fedimg.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/fedimg.cfg.j2 index 87281db61d..4077ddf355 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/fedimg.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/fedimg.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name fedimg alias FEDIMG servers members {% for host in groups['fedimg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name fedimg-stg alias STG FEDIMG servers members {% for host in groups['fedimg-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/fedmsg.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/fedmsg.cfg.j2 index 6e67528110..5f8e481557 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/fedmsg.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/fedmsg.cfg.j2 @@ -2,71 +2,83 @@ define hostgroup { hostgroup_name fedmsg-gateways alias FEDMSG-GATEWAYS servers members {% for host in groups['fedmsg-gateways'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name fedmsg-gateways-stg alias STG FEDMSG-GATEWAYS servers members {% for host in groups['fedmsg-gateways-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name fedmsg-hubs alias FEDMSG-HUBS servers members {% for host in groups['fedmsg-hubs'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name fedmsg-hubs-stg alias STG FEDMSG-HUBS servers members {% for host in groups['fedmsg-hubs-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name fedmsg-qa-network alias FEDMSG-QA servers members {% for host in groups['fedmsg-qa-network'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name fedmsg-qa-stg alias STG FEDMSG-QA servers members {% for host in groups['fedmsg-qa-network-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name fedmsg-relays alias FEDMSG-RELAYS servers members {% for host in groups['fedmsg-relays'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name fedmsg-relays-stg alias STG FEDMSG-RELAYS servers members {% for host in groups['fedmsg-relays-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name fedmsg-ircs alias FEDMSG-IRCS servers members {% for host in groups['fedmsg-ircs'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name fedmsg-ircs-stg alias STG FEDMSG-IRCS servers members {% for host in groups['fedmsg-ircs-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name fedmsg-services alias FEDMSG-SERVICES servers members {% for host in groups['fedmsg-services'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name fedmsg-services-stg alias STG FEDMSG-SERVICES servers members {% for host in groups['fedmsg-services-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/fedocal.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/fedocal.cfg.j2 index eccfdcf0a3..39dba43a78 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/fedocal.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/fedocal.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name fedocal alias FEDOCAL servers members {% for host in groups['fedocal'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name fedocal-stg alias STG FEDOCAL servers members {% for host in groups['fedocal-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/github2fedmsg.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/github2fedmsg.cfg.j2 index 245192d3ca..4480c7fb15 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/github2fedmsg.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/github2fedmsg.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name github2fedmsg alias GITHUB2FEDMSG servers members {% for host in groups['github2fedmsg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name github2fedmsg-stg alias STG GITHUB2FEDMSG servers members {% for host in groups['github2fedmsg-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/hosted.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/hosted.cfg.j2 index 5c72702e02..cefb8c1c00 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/hosted.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/hosted.cfg.j2 @@ -2,4 +2,5 @@ define hostgroup { hostgroup_name hosted alias Hosted Servers members {% for host in groups['hosted'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/hotness.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/hotness.cfg.j2 index 8e496c43af..a2e35696f3 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/hotness.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/hotness.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name hotness alias HOTNESS servers members {% for host in groups['hotness'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name hotness-stg alias STG HOTNESS servers members {% for host in groups['hotness-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/infinote.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/infinote.cfg.j2 index 4eec95b23a..89edb32ec3 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/infinote.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/infinote.cfg.j2 @@ -2,6 +2,7 @@ define hostgroup { hostgroup_name infinoteservers alias Infinote Servers members {% for host in groups['infinote'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/ipa.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/ipa.cfg.j2 index c4d8f39e66..b2d4a91050 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/ipa.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/ipa.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name ipa alias IPA servers members {% for host in groups['ipa'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name ipa-stg alias STG IPA servers members {% for host in groups['ipa-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/ipsilon.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/ipsilon.cfg.j2 index 84d0eb47d8..7e699b811e 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/ipsilon.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/ipsilon.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name ipsilon alias IPSILON servers members {% for host in groups['ipsilon'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name ipsilon-stg alias STG IPSILON servers members {% for host in groups['ipsilon-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/jenkins.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/jenkins.cfg.j2 index d04e85e3c5..fee353faac 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/jenkins.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/jenkins.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name jenkins-master alias JENKINS MASTER servers members {% for host in groups['jenkins-master'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name jenkins-slave alias JENKINS SLAVE servers members {% for host in groups['jenkins-slave'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/kernel.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/kernel.cfg.j2 index 6b7d514b63..6fb3e3816e 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/kernel.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/kernel.cfg.j2 @@ -2,17 +2,20 @@ define hostgroup { hostgroup_name kernel-qa alias KERNEL QA servers members {% for host in groups['kernel-qa'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name kerneltest alias KERNEL TEST servers members {% for host in groups['kerneltest'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name kerneltest-stg alias STG KERNEL TEST servers members {% for host in groups['kerneltest-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/koji.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/koji.cfg.j2 index 4a7cdc7b52..4210bb0c3d 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/koji.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/koji.cfg.j2 @@ -2,16 +2,19 @@ define hostgroup { hostgroup_name koji alias KOJI servers members {% for host in groups['koji'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name koji-stg alias STG KOJI servers members {% for host in groups['koji-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name kojipkgs alias KOJI PKGS servers members {% for host in groups['kojipkgs'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/koschei.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/koschei.cfg.j2 index b4a0824a44..6df058c5ef 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/koschei.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/koschei.cfg.j2 @@ -2,24 +2,28 @@ define hostgroup { hostgroup_name koschei-backend alias KOSCHEI-BACKEND servers members {% for host in groups['koschei-backend'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name koschei-backend-stg alias STG KOSCHEI-BACKEND servers members {% for host in groups['koschei-backend-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name koschei-web alias KOSCHEI-WEB servers members {% for host in groups['koschei-web'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name koschei-web-stg alias STG KOSCHEI-WEB servers members {% for host in groups['koschei-web-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/mailman.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/mailman.cfg.j2 index 3870f51be7..a145b17fec 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/mailman.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/mailman.cfg.j2 @@ -2,16 +2,19 @@ define hostgroup { hostgroup_name mailman alias MAILMAN servers members {% for host in groups['mailman'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name mailman-stg alias STG MAILMAN servers members {% for host in groups['mailman-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name smtp-mm alias SMTP MAILMAN servers members {% for host in groups['smtp-mm'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/mdapi.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/mdapi.cfg.j2 index 22eee9e76d..d5f9d4aee6 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/mdapi.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/mdapi.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name mdapi alias MDAPI servers members {% for host in groups['mdapi'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name mdapi-stg alias STG MDAPI servers members {% for host in groups['mdapi-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/memcached.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/memcached.cfg.j2 index 84edc7f8d0..62d1f8acf1 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/memcached.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/memcached.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name memcached alias MEMCACHED servers members {% for host in groups['memcached'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name memcached-stg alias STG MEMCACHED servers members {% for host in groups['memcached-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/mirroring.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/mirroring.cfg.j2 index c733687fcd..55642afae6 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/mirroring.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/mirroring.cfg.j2 @@ -2,47 +2,55 @@ define hostgroup { hostgroup_name mirrorlist2 alias MIRRORLIST2 servers members {% for host in groups['mirrorlist2'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name mirrorlist2-stg alias STG MIRRORLIST2 servers members {% for host in groups['mirrorlist2-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name mm-backend alias MM-BACKEND servers members {% for host in groups['mm-backend'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name mm-backend-stg alias STG MM-BACKEND servers members {% for host in groups['mm-backend-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name mm-crawler alias MM-CRAWLER servers members {% for host in groups['mm-crawler'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name mm-crawler-stg alias STG MM-CRAWLER servers members {% for host in groups['mm-crawler-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name mm-frontend alias MM-FRONTEND servers members {% for host in groups['mm-frontend'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name mm-frontend-stg alias STG MM-FRONTEND servers members {% for host in groups['mm-frontend-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/modernpaste.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/modernpaste.cfg.j2 index 229eb4f8cc..3eca491a1a 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/modernpaste.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/modernpaste.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name modernpaste alias MODERNPASTE servers members {% for host in groups['modernpaste'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name modernpaste-stg alias STG MODERNPASTE servers members {% for host in groups['modernpaste-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/moksha.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/moksha.cfg.j2 index 204b11da09..1860477c27 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/moksha.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/moksha.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name moksha-hubs alias MOKSHA-HUBS servers members {% for host in groups['moksha-hubs'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name moksha-hubs-stg alias STG MOKSHA-HUBS servers members {% for host in groups['moksha-hubs-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/notifs.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/notifs.cfg.j2 index 0d916c28ae..56b4311033 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/notifs.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/notifs.cfg.j2 @@ -2,23 +2,27 @@ define hostgroup { hostgroup_name notifs-backend alias NOTIFS-BACKEND servers members {% for host in groups['notifs-backend'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name notifs-backend-stg alias STG NOTIFS-BACKEND servers members {% for host in groups['notifs-backend-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name notifs-web alias NOTIFS-WEB servers members {% for host in groups['notifs-web'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name notifs-web-stg alias STG NOTIFS-WEB servers members {% for host in groups['notifs-web-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/nuancier.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/nuancier.cfg.j2 index 5f853abe60..3c4d6f86ed 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/nuancier.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/nuancier.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name nuancier alias NUANCIER servers members {% for host in groups['nuancier'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name nuancier-stg alias STG NUANCIER servers members {% for host in groups['nuancier-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/openqa.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/openqa.cfg.j2 index c1d1921ca5..737a247340 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/openqa.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/openqa.cfg.j2 @@ -2,17 +2,20 @@ define hostgroup { hostgroup_name openqa alias OPENQA servers members {% for host in groups['openqa'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name openqa-workers alias OPENQA workers members {% for host in groups['openqa-workers'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name openqa-stg alias STG OPENQA servers members {% for host in groups['openqa-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/osbs.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/osbs.cfg.j2 index 547ff55ab9..06b3bacdf0 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/osbs.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/osbs.cfg.j2 @@ -2,12 +2,14 @@ define hostgroup { hostgroup_name osbs-control alias OSBS-CONTROL servers members {% for host in groups['osbs-control'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name osbs-control-stg alias STG OSBS-CONTROL servers members {% for host in groups['osbs-control-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } @@ -15,23 +17,27 @@ define hostgroup { hostgroup_name osbs-masters alias OSBS-MASTERS servers members {% for host in groups['osbs-masters'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name osbs-masters-stg alias STG OSBS-MASTERS servers members {% for host in groups['osbs-masters-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name osbs-nodes alias OSBS-NODES servers members {% for host in groups['osbs-nodes'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name osbs-nodes-stg alias STG OSBS-NODES servers members {% for host in groups['osbs-nodes-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/packages.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/packages.cfg.j2 index f2177f36fc..11c367e621 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/packages.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/packages.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name packages alias PACKAGES servers members {% for host in groups['packages'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name packages-stg alias STG PACKAGES servers members {% for host in groups['packages-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/pagure.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/pagure.cfg.j2 index 04141a945d..dc78cecddf 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/pagure.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/pagure.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name pagure alias PAGURE servers members {% for host in groups['pagure'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name pagure-stg alias STG PAGURE servers members {% for host in groups['pagure-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/paste.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/paste.cfg.j2 index 73bccb793b..b1cac8f297 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/paste.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/paste.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name paste alias PASTE servers members {% for host in groups['paste'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name paste-stg alias STG PASTE servers members {% for host in groups['paste-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/pdc.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/pdc.cfg.j2 index e64d16ebcd..3cad4c58b5 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/pdc.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/pdc.cfg.j2 @@ -2,23 +2,27 @@ define hostgroup { hostgroup_name pdc-backend alias PDC-BACKEND servers members {% for host in groups['pdc-backend'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name pdc-backend-stg alias STG PDC-BACKEND servers members {% for host in groups['pdc-backend-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name pdc-web alias PDC-WEB servers members {% for host in groups['pdc-web'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name pdc-web-stg alias STG PDC-WEB servers members {% for host in groups['pdc-web-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/people.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/people.cfg.j2 index de71d43000..bc9d5a884d 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/people.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/people.cfg.j2 @@ -2,6 +2,7 @@ define hostgroup { hostgroup_name peopleservers alias People Servers members {% for host in groups['people'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/pgbdr.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/pgbdr.cfg.j2 index 820475484f..4ab8fa1d76 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/pgbdr.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/pgbdr.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name pgbdr alias PGBDR servers members {% for host in groups['pgbdr'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name pgbdr-stg alias STG PGBDR servers members {% for host in groups['pgbdr-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/pkgdb.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/pkgdb.cfg.j2 index e075f818f7..174132545d 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/pkgdb.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/pkgdb.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name pkgdb alias PKGDB servers members {% for host in groups['pkgdb'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name pkgdb-stg alias STG PKGDB servers members {% for host in groups['pkgdb-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/pkgs.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/pkgs.cfg.j2 index d9cd82fb8a..24759f9a88 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/pkgs.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/pkgs.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name pkgs alias PKGS servers members {% for host in groups['pkgs'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name pkgs-stg alias STG PKGS servers members {% for host in groups['pkgs-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/releng.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/releng.cfg.j2 index c79b0843ec..5603de6434 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/releng.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/releng.cfg.j2 @@ -2,17 +2,20 @@ define hostgroup { hostgroup_name releng-compose alias Releng Composers members {% for host in groups['releng-compose'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name releng-secondary alias Releng 2nd Composers members {% for host in groups['releng-secondary'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name releng-stg alias Releng Stg Composers members {% for host in groups['releng-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/relvalconsumer.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/relvalconsumer.cfg.j2 index 56aa3eacaa..0319518c32 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/relvalconsumer.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/relvalconsumer.cfg.j2 @@ -2,5 +2,6 @@ define hostgroup { hostgroup_name relvalconsumer alias RELVALCONSUMER servers members {% for host in groups['relvalconsumer'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/resultsdb.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/resultsdb.cfg.j2 index 59b8871027..bb661a7a04 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/resultsdb.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/resultsdb.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name resultsdb-prod alias RESULTSDB servers members {% for host in groups['resultsdb-prod'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name resultsdb-stg alias STG RESULTSDB servers members {% for host in groups['resultsdb-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/statscache.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/statscache.cfg.j2 index 8fd66deab4..befba02ae4 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/statscache.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/statscache.cfg.j2 @@ -2,23 +2,27 @@ define hostgroup { hostgroup_name statscache-backend alias STATSCACHE-BACKEND servers members {% for host in groups['statscache-backend'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name statscache-backend-stg alias STG STATSCACHE-BACKEND servers members {% for host in groups['statscache-backend-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name statscache-web alias STATSCACHE-WEB servers members {% for host in groups['statscache-web'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name statscache-web-stg alias STG STATSCACHE-WEB servers members {% for host in groups['statscache-web-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/summershum.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/summershum.cfg.j2 index 39bfc5085d..431681a1c3 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/summershum.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/summershum.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name summershum alias SUMMERSHUM servers members {% for host in groups['summershum'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name summershum-stg alias STG SUMMERSHUM servers members {% for host in groups['summershum-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/sundries.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/sundries.cfg.j2 index d77dcf8eab..a0e74f84af 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/sundries.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/sundries.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name sundries alias SUNDRIES servers members {% for host in groups['sundries'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name sundries-stg alias STG SUNDRIES servers members {% for host in groups['sundries-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/tagger.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/tagger.cfg.j2 index 49323b2002..a7add5540b 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/tagger.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/tagger.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name tagger alias TAGGER servers members {% for host in groups['tagger'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name tagger-stg alias STG TAGGER servers members {% for host in groups['tagger-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/taskotron.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/taskotron.cfg.j2 index cb75d86245..5bf4a0f366 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/taskotron.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/taskotron.cfg.j2 @@ -10,3 +10,4 @@ define hostgroup { alias Taskotron Staging Hosts members {% for host in groups['taskotron-stg'] %}{{host}}{% endfor %}{% for host in groups['taskotron-stg-client-hosts'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} +} diff --git a/roles/nagios_server/templates/nagios/hostgroups/torrent.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/torrent.cfg.j2 index bb6b0b37db..616ca23a05 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/torrent.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/torrent.cfg.j2 @@ -2,6 +2,7 @@ define hostgroup { hostgroup_name torrent-servers alias Torrent Servers members {% for host in groups['torrent'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/unbound.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/unbound.cfg.j2 index e550fcb1e9..45d43884bd 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/unbound.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/unbound.cfg.j2 @@ -6,6 +6,7 @@ define hostgroup { hostgroup_name unboundservers alias Unbound Servers members {% for host in groups['unbound'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/value.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/value.cfg.j2 index 5a6bf0501d..dd3579cc2a 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/value.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/value.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name value alias VALUE servers members {% for host in groups['value'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name value-stg alias STG VALUE servers members {% for host in groups['value-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2 index 1bb50d77dc..a27a83f461 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2 @@ -6,4 +6,5 @@ define hostgroup { hostgroup_name vpnclients alias vpnclients members tummy01,unbound-tummy01,smtp-mm-tummy01,proxy03,unbound-osuosl01,coloamer01,proxy08,osuosl02,proxy09,download-ib01,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent02,ibiblio03,ibiblio04,people02,internetx01,ns05,proxy02,osuosl01,proxy06,osuosl02,osuosl03,hosted03,smtp-mm-osuosl01,dedicatedsolutions01,proxy05,dedicatedsolutions01,proxy11,ibiblio05,proxy12 + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/web.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/web.cfg.j2 index 24bd8e3fe2..3c727aaad2 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/web.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/web.cfg.j2 @@ -6,5 +6,6 @@ define hostgroup { hostgroup_name webservers alias webservers members {% for host in groups['webservers'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/wiki.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/wiki.cfg.j2 index 4527870b90..6c8130d2a1 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/wiki.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/wiki.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name wiki alias WIKI servers members {% for host in groups['wiki'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name wiki-stg alias STG WIKI servers members {% for host in groups['wiki-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/zanata2fedmsg.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/zanata2fedmsg.cfg.j2 index 400ec29f74..15af96beda 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/zanata2fedmsg.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/zanata2fedmsg.cfg.j2 @@ -2,11 +2,13 @@ define hostgroup { hostgroup_name zanata2fedmsg alias ZANATA2FEDMSG servers members {% for host in groups['zanata2fedmsg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } define hostgroup { hostgroup_name zanata2fedmsg-stg alias STG ZANATA2FEDMSG servers members {% for host in groups['zanata2fedmsg-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + }