From f1113e2f2a1974fbb4afdd42965bbc090a495bd2 Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Feb 26 2020 00:23:00 +0000
Subject: clean up nagios cloud to use cloud_phx2


---

diff --git a/inventory/cloud b/inventory/cloud
index 3fd72b7..8a1e2cf 100644
--- a/inventory/cloud
+++ b/inventory/cloud
@@ -1,4 +1,4 @@
-[cloud]
+[cloud_phx2]
 ##
 ## Hardware
 ##
@@ -50,16 +50,22 @@ developer.fedorainfracloud.org
 fedora-bootstrap.fedorainfracloud.org
 happinesspackets.fedorainfracloud.org
 happinesspackets-stg.fedorainfracloud.org
-#iddev.fedorainfracloud.org
 simple-koji-ci-prod.fedorainfracloud.org
 ppc64le-test.fedorainfracloud.org
-#rawhide-test.fedorainfracloud.org
-#respins.fedorainfracloud.org
-#telegram-irc.fedorainfracloud.org
-#testdays.fedorainfracloud.org
 upstreamfirst.fedorainfracloud.org
 ##
 ## New Community Hardware
 ##
 os-proxy01.fedorainfracloud.org
 os-proxy02.fedorainfracloud.org
+
+[cloud_external]
+iddev.fedorainfracloud.org
+rawhide-test.fedorainfracloud.org
+respins.fedorainfracloud.org
+telegram-irc.fedorainfracloud.org
+testdays.fedorainfracloud.org
+
+[cloud:children]
+cloud_phx2
+cloud_external
diff --git a/roles/nagios_server/templates/nagios/hosts/cloud-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/cloud-hosts.cfg.j2
index 142fa4a..2f845b0 100644
--- a/roles/nagios_server/templates/nagios/hosts/cloud-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/cloud-hosts.cfg.j2
@@ -1,4 +1,4 @@
-{% for host in groups['cloud']|sort %}
+{% for host in groups['cloud_phx2']|sort %}
 define host {
 {% if hostvars[host].nagios_Check_Services['nrpe'] and vars['nagios_location'] == 'internal' %}
    use                     defaulttemplate
@@ -14,7 +14,7 @@ define host {
 {% if hostvars[host].eth0_ip is defined %}
    address                 {{ hostvars[host].eth0_ip }}
 {% elif hostvars[host].ansible_default_ipv4 is defined %}
-{% if hostvars[host].ansible_default_ipv4.address is defined and host not in groups['cloud'] %}
+{% if hostvars[host].ansible_default_ipv4.address is defined and host not in groups['cloud_phx2'] %}
    address                 {{ hostvars[host].ansible_default_ipv4.address }}
 {% endif %}
 {% else %}