From d1a2dc7ce2079bb08f8907320fd1993670b047fb Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Feb 26 2020 22:32:36 +0000
Subject: add aarch64-test to cloud_aws group


---

diff --git a/inventory/cloud b/inventory/cloud
index daaba9e..d391199 100644
--- a/inventory/cloud
+++ b/inventory/cloud
@@ -58,6 +58,8 @@ f32-test.fedorainfracloud.org
 rawhide-test.fedorainfracloud.org
 el6-test.fedorainfracloud.org
 el7-test.fedorainfracloud.org
+aarch64-test01.fedorainfracloud.org
+aarch64-test02.fedorainfracloud.org
 # iddev
 iddev.fedorainfracloud.org
 # respins
diff --git a/roles/nagios_server/templates/nagios/hostgroups/checkswap.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/checkswap.cfg.j2
index 3242330..4236e85 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/checkswap.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/checkswap.cfg.j2
@@ -1,6 +1,6 @@
 define hostgroup {
         hostgroup_name  CheckSwap
         alias           Swap-Is-Low
-        members         {% for host in groups['all']|sort %}{% if hostvars[host].nagios_Check_Services['swap'] == true and hostvars[host].nagios_Check_Services['ping'] == true %}{{host}}{% if not loop.last %},{% endif %} {% endif %} {% endfor %}
+        members         {% for host in groups['all']|sort %}{% if hostvars[host].nagios_Check_Services['swap'] == true and hostvars[host].nagios_Can_Connect == true %}{{host}}{% if not loop.last %},{% endif %} {% endif %} {% endfor %}
 
 }
diff --git a/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2
index dc83b35..c987491 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2
@@ -3,6 +3,6 @@
 define hostgroup {
         hostgroup_name  vpnclients
         alias           vpnclients
-        members         !bastion02.phx2.fedoraproject.org, {% for host in groups['all']|sort %}{% if ( hostvars[host].vpn == true ) and ( hostvars[host].nagios_Check_Services['ping'] == true ) %}{{host}},{% endif %} {% endfor %}
+        members         !bastion02.phx2.fedoraproject.org, {% for host in groups['all']|sort %}{% if ( hostvars[host].vpn == true ) and ( hostvars[host].nagios_Can_Connect == true ) %}{{host}},{% endif %} {% endfor %}
 
 }
diff --git a/roles/nagios_server/templates/nagios/hosts/internetx-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/internetx-hosts.cfg.j2
index 5ab3761..cdb7ab6 100644
--- a/roles/nagios_server/templates/nagios/hosts/internetx-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/internetx-hosts.cfg.j2
@@ -1,5 +1,5 @@
 {% for host in groups['all']|sort %}
-{% if hostvars[host].datacenter == 'internetx' and hostvars[host].nagios_Check_Services['ping'] == true %}
+{% if hostvars[host].datacenter == 'internetx' and hostvars[host].nagios_Can_Connect == true %}
 define host {
 {% if vars['nagios_location'] == 'internal' %}
    use                     defaulttemplate