From 6ec26357f998097f915ca4fa86cddecda40426e2 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Sat, 29 Apr 2017 23:22:43 +0000 Subject: [PATCH] ok servicegroups do not like , at the end sometimes. --- roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 | 2 +- .../nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 | 2 +- .../templates/nagios/servicegroups/freemedia.cfg.j2 | 2 +- roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2 | 2 +- .../templates/nagios/servicegroups/mgmt-http.cfg.j2 | 2 +- .../templates/nagios/servicegroups/mgmt-https.cfg.j2 | 2 +- .../templates/nagios/servicegroups/mirrorlist.cfg.j2 | 2 +- roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg.j2 | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 index 919a152434..d1376fa848 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 +++ b/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 @@ -1,7 +1,7 @@ define servicegroup { servicegroup_name bodhi alias Bodhi - members {% for host in groups['bodhi2'] %}{{host}}, bodhi, {% endfor %}{% for host in groups['proxies'] %}{{host}}, bodhi, {% endfor %} + members {% for host in groups['bodhi2'] %}{{host}}, bodhi, {% endfor %}{% for host in groups['proxies'] %}{{host}}, bodhi {{ "," if not loop.last }} {% endfor %} } diff --git a/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 index 5dbec1292e..48ea942ae3 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 +++ b/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}}, fedoraproject.org - wiki - non-cached, {% endfor %}{% for host in groups['proxies'] %}{{host}}, fedoraproject.org - wiki, {% endfor %} + 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 }} {% endfor %} } diff --git a/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2 index bf0f0847dc..b80bd2d653 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2 +++ b/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2 @@ -1,7 +1,7 @@ define servicegroup { servicegroup_name freemedia alias FreeMedia - members {% for host in groups['sundries'] %}{{host}}, freemedia-internal, {% endfor %} + members {% for host in groups['sundries'] %}{{host}}, freemedia-internal {{ "," if not loop.last }} {% endfor %} } diff --git a/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2 index 967b0166ad..c7616dcff0 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2 +++ b/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2 @@ -1,6 +1,6 @@ define servicegroup { servicegroup_name ipa alias IPA Servers - members {% for host in groups['ipa'] %}{{host}}, IPA Replication Status, {% endfor %} + members {% for host in groups['ipa'] %}{{host}}, IPA Replication Status {{ "," if not loop.last }} {% endfor %} } diff --git a/roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg.j2 index 733a0d673e..52c026adc7 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg.j2 +++ b/roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg.j2 @@ -1,6 +1,6 @@ define servicegroup { servicegroup_name mgmt-http alias mgmt interfaces on http - members {% for host in vars['phx2_management_hosts'] %}{{ host }},{{ host }}-http,{% endfor %} + members {% for host in vars['phx2_management_hosts'] %}{{ host }},{{ host }}-http {{ "," if not loop.last }}{% endfor %} } diff --git a/roles/nagios_server/templates/nagios/servicegroups/mgmt-https.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/mgmt-https.cfg.j2 index 3c9e649249..90546a112d 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/mgmt-https.cfg.j2 +++ b/roles/nagios_server/templates/nagios/servicegroups/mgmt-https.cfg.j2 @@ -1,6 +1,6 @@ define servicegroup { servicegroup_name mgmt-https alias mgmt interfaces on https - members {% for host in vars['phx2_management_hosts'] %}{{ host }},{{ host }}-https,{% endfor %} + members {% for host in vars['phx2_management_hosts'] %}{{ host }},{{ host }}-https {{ "," if not loop.last }}{% endfor %} } diff --git a/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2 index f57b62b789..aa643a0623 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2 +++ b/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, {% endfor %} + members {% for host in groups['proxies'] %}{{host}}, http-mirrors.fedoraproject.org-mirrorlist {{ "," if not loop.last }} {% endfor %} } diff --git a/roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg.j2 index 003762072c..bb0f9f3792 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg.j2 +++ b/roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg.j2 @@ -1,7 +1,7 @@ define servicegroup { servicegroup_name pkgdb alias Package Database - members {% for host in groups['pkgdb'] %}{{host}}, pkgdb-external,{{host}}, pkgdb-internal, {% endfor %} + members {% for host in groups['pkgdb'] %}{{host}}, pkgdb-external,{{host}}, pkgdb-internal {{ "," if not loop.last }} {% endfor %} }