From dffa4d33ea46dea8b1625549becf9c7dad1c5834 Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Apr 24 2020 19:34:25 +0000
Subject: try to set this for hosts in aws cleanly and in one spot


---

diff --git a/inventory/cloud b/inventory/cloud
index 5c4a39e..bf7fb85 100644
--- a/inventory/cloud
+++ b/inventory/cloud
@@ -59,13 +59,31 @@ upstreamfirst.fedorainfracloud.org
 os-proxy01.fedorainfracloud.org
 os-proxy02.fedorainfracloud.org
 
-[cloud_external]
+[cloud_aws]
 iddev.fedorainfracloud.org
 rawhide-test.fedorainfracloud.org
 respins.fedorainfracloud.org
 telegram-irc.fedorainfracloud.org
 testdays.fedorainfracloud.org
+proxy30.fedoraproject.org
+copr-be.aws.fedoraproject.org
+copr-be-dev.aws.fedoraproject.org
+copr-dist-git.aws.fedoraproject.org
+copr-dist-git-dev.aws.fedoraproject.org
+copr-fe.aws.fedoraproject.org
+copr-fe-dev.aws.fedoraproject.org
+copr-keygen.aws.fedoraproject.org
+copr-keygen-dev.aws.fedoraproject.org
+#copr-be-dev.cloud.fedoraproject.org
+copr-dist-git-dev.fedorainfracloud.org
+iddev.fedorainfracloud.org
+f30-test.fedorainfracloud.org
+f31-test.fedorainfracloud.org
+f32-test.fedorainfracloud.org
+rawhide-test.fedorainfracloud.org
+el6-test.fedorainfracloud.org
+el7-test.fedorainfracloud.org
 
 [cloud:children]
 cloud_phx2
-cloud_external
+cloud_aws
diff --git a/inventory/group_vars/cloud_aws b/inventory/group_vars/cloud_aws
new file mode 100644
index 0000000..a84312b
--- /dev/null
+++ b/inventory/group_vars/cloud_aws
@@ -0,0 +1,21 @@
+# For Fedora instances, we want to ssh as 'fedora', not as 'root'
+#ansible_ssh_user: fedora
+# Disabled, it was only needed initially for proxy30.fedoraproject.org
+#ansible_become: true
+#ansible_become_user: root
+#ansible_become_method: sudo
+
+# Disable ethX ifcfg, let amazon handle these via DHCP.
+ansible_ifcfg_blacklist: true
+
+datacenter: aws
+nagios_Check_Services:
+  mail: false
+  nrpe: false
+  sshd: false
+  named: false
+  dhcpd: false
+  httpd: false
+  swap: false
+  ping: false
+  raid: false
diff --git a/inventory/group_vars/ec2 b/inventory/group_vars/ec2
deleted file mode 100644
index a84312b..0000000
--- a/inventory/group_vars/ec2
+++ /dev/null
@@ -1,21 +0,0 @@
-# For Fedora instances, we want to ssh as 'fedora', not as 'root'
-#ansible_ssh_user: fedora
-# Disabled, it was only needed initially for proxy30.fedoraproject.org
-#ansible_become: true
-#ansible_become_user: root
-#ansible_become_method: sudo
-
-# Disable ethX ifcfg, let amazon handle these via DHCP.
-ansible_ifcfg_blacklist: true
-
-datacenter: aws
-nagios_Check_Services:
-  mail: false
-  nrpe: false
-  sshd: false
-  named: false
-  dhcpd: false
-  httpd: false
-  swap: false
-  ping: false
-  raid: false
diff --git a/inventory/host_vars/el6-test.fedorainfracloud.org b/inventory/host_vars/el6-test.fedorainfracloud.org
index e70b550..ece6e1b 100644
--- a/inventory/host_vars/el6-test.fedorainfracloud.org
+++ b/inventory/host_vars/el6-test.fedorainfracloud.org
@@ -1,2 +1,14 @@
 ---
 tcp_ports: [22]
+
+datacenter: aws
+nagios_Check_Services:
+  mail: false
+  nrpe: false
+  sshd: false
+  named: false
+  dhcpd: false
+  httpd: false
+  swap: false
+  ping: false
+  raid: false
diff --git a/inventory/host_vars/el7-test.fedorainfracloud.org b/inventory/host_vars/el7-test.fedorainfracloud.org
index e70b550..ece6e1b 100644
--- a/inventory/host_vars/el7-test.fedorainfracloud.org
+++ b/inventory/host_vars/el7-test.fedorainfracloud.org
@@ -1,2 +1,14 @@
 ---
 tcp_ports: [22]
+
+datacenter: aws
+nagios_Check_Services:
+  mail: false
+  nrpe: false
+  sshd: false
+  named: false
+  dhcpd: false
+  httpd: false
+  swap: false
+  ping: false
+  raid: false
diff --git a/inventory/host_vars/iddev.fedorainfracloud.org b/inventory/host_vars/iddev.fedorainfracloud.org
index 9ea2083..0eaeedb 100644
--- a/inventory/host_vars/iddev.fedorainfracloud.org
+++ b/inventory/host_vars/iddev.fedorainfracloud.org
@@ -1,8 +1,8 @@
 ---
 ansible_ifcfg_blacklist: true
-datacenter: aws
 tcp_ports: [22, 80, 443]
 
+datacenter: aws
 nagios_Check_Services:
   mail: false
   nrpe: false
diff --git a/inventory/inventory b/inventory/inventory
index 0dab012..058c5f9 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -1336,16 +1336,3 @@ virthost-aarch64-os02.fedorainfracloud.org
 os-proxy01.fedorainfracloud.org
 os-proxy02.fedorainfracloud.org
 
-[ec2]
-proxy30.fedoraproject.org
-copr-be.aws.fedoraproject.org
-copr-be-dev.aws.fedoraproject.org
-copr-dist-git.aws.fedoraproject.org
-copr-dist-git-dev.aws.fedoraproject.org
-copr-fe.aws.fedoraproject.org
-copr-fe-dev.aws.fedoraproject.org
-copr-keygen.aws.fedoraproject.org
-copr-keygen-dev.aws.fedoraproject.org
-#copr-be-dev.cloud.fedoraproject.org
-copr-dist-git-dev.fedorainfracloud.org
-iddev.fedorainfracloud.org
diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml
index 3473357..cafc4e2 100644
--- a/playbooks/groups/proxies.yml
+++ b/playbooks/groups/proxies.yml
@@ -22,7 +22,7 @@
   - rkhunter
   - nagios_client
   - { role: ec2_proxy,
-      when: "inventory_hostname in groups['ec2']" }
+      when: "inventory_hostname in groups['cloud_aws']" }
   - collectd/base
   - sudo
   - rsyncd
diff --git a/roles/nagios_server/templates/nagios/hosts/aws-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/aws-hosts.cfg.j2
index 4018a74..af65073 100644
--- a/roles/nagios_server/templates/nagios/hosts/aws-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/aws-hosts.cfg.j2
@@ -1,4 +1,4 @@
-{% for host in groups['ec2']|sort %}
+{% for host in groups['cloud_aws']|sort %}
 define host {
    use                     aws
    host_name               {{ host }}