From 0cbcbb826d86f98694bc1be0b6975d106e2a6318 Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Sat, 7 Jan 2017 23:21:58 +0000
Subject: [PATCH] and we have to remember no children are allowed

---
 roles/nagios_server/tasks/main.yml                            | 4 +++-
 roles/nagios_server/templates/nagios/hostgroups/anitya.cfg.j2 | 2 +-
 .../templates/nagios/hostgroups/autocloud.cfg.j2              | 4 ++--
 .../nagios_server/templates/nagios/hostgroups/buildarm.cfg.j2 | 2 +-
 roles/nagios_server/templates/nagios/hostgroups/copr.cfg.j2   | 4 ++--
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index f3284e5cea..5cfa37287d 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -262,7 +262,9 @@
     - vpnclients.cfg
     - web.cfg
     - wiki.cfg
-    - zanata2fedmsg.cfg
+##
+## not implemented yet
+#    - zanata2fedmsg.cfg
   tags:
   - nagios_server
 
diff --git a/roles/nagios_server/templates/nagios/hostgroups/anitya.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/anitya.cfg.j2
index d929e69feb..a8e0dd7c51 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/anitya.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/anitya.cfg.j2
@@ -15,6 +15,6 @@ define hostgroup {
 define hostgroup {
         hostgroup_name  anitya
         alias           anitya
-        members         {% for host in groups['anitya:children'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} 
+        members         {% for host in groups['anitya'] %}{{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 326c15db49..3e1fff9bab 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/autocloud.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/autocloud.cfg.j2
@@ -25,13 +25,13 @@ define hostgroup {
 define hostgroup {
         hostgroup_name  autocloud-backend
         alias           Autocloud Backend
-        members         {% for host in groups['autocloud-backend:children'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
+        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:children'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
+        members         {% for host in groups['autocloud-backend-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
 }
 
 define hostgroup {
diff --git a/roles/nagios_server/templates/nagios/hostgroups/buildarm.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/buildarm.cfg.j2
index 042c58e3bf..934507f615 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/buildarm.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/buildarm.cfg.j2
@@ -39,7 +39,7 @@ define hostgroup {
 define hostgroup {
         hostgroup_name  buildarm
         alias           Builders for ARM
-        members         {% for host in groups['buildarm:children'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
+        members         {% for host in groups['buildarm'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
 }
 
 define hostgroup {
diff --git a/roles/nagios_server/templates/nagios/hostgroups/copr.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/copr.cfg.j2
index 24db96fb99..9bd1abbe82 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/copr.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/copr.cfg.j2
@@ -49,12 +49,12 @@ define hostgroup {
 define hostgroup {
         hostgroup_name  copr
         alias           Copr servers
-        members         {% for host in groups['copr:children'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
+        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:children'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
+        members         {% for host in groups['copr-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
 }