try to set this for hosts in aws cleanly and in one spot

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

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

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

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

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

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

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 }}