From 3f4e398580c1d02c75e17ee27c645c280bfe8494 Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Sun, 17 Mar 2019 18:04:41 +0000
Subject: [PATCH] [nagios/cloud-hosts] Fix virthost-aarch64

When adding a host to the cloud, it needs to be added to the inventory
file. The data in the file was organized by alphabet which meant that it
wasn't clear that hardware was also in this group. Reorganized the file.

Added data to the virthost data to make it clearer that it is like the
other cloud hosts. Removed it from the vpn mail group because it is not
on the vpn. We will need to create a cloud postfix group for these boxes.
---
 inventory/cloud                               | 44 +++++++++++--------
 ...virthost-aarch64-os01.fedorainfracloud.org | 14 ++++--
 ...virthost-aarch64-os02.fedorainfracloud.org | 13 +++++-
 3 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/inventory/cloud b/inventory/cloud
index 9b989e665e..038132a1b7 100644
--- a/inventory/cloud
+++ b/inventory/cloud
@@ -1,4 +1,30 @@
 [cloud]
+##
+## Hardware
+##
+#fed-cloud01.cloud.fedoraproject.org
+#fed-cloud02.cloud.fedoraproject.org
+fed-cloud03.cloud.fedoraproject.org
+fed-cloud04.cloud.fedoraproject.org
+fed-cloud05.cloud.fedoraproject.org
+fed-cloud06.cloud.fedoraproject.org
+fed-cloud07.cloud.fedoraproject.org
+fed-cloud08.cloud.fedoraproject.org
+fed-cloud09.cloud.fedoraproject.org
+#fed-cloud10.cloud.fedoraproject.org
+#fed-cloud11.cloud.fedoraproject.org
+fed-cloud12.cloud.fedoraproject.org
+fed-cloud13.cloud.fedoraproject.org
+#fed-cloud14.cloud.fedoraproject.org
+fed-cloud15.cloud.fedoraproject.org
+#fed-cloud16.cloud.fedoraproject.org
+#fed-cloud-ppc01.cloud.fedoraproject.org
+fed-cloud-ppc02.cloud.fedoraproject.org
+virthost-aarch64-os01.fedorainfracloud.org
+virthost-aarch64-os02.fedorainfracloud.org
+##
+## Clients
+##
 ansiblemagazine.fedorainfracloud.org
 arm03-packager00.cloud.fedoraproject.org
 arm03-packager01.cloud.fedoraproject.org
@@ -28,24 +54,6 @@ f28-test.fedorainfracloud.org
 f29-test.fedorainfracloud.org
 fas2-dev.fedorainfracloud.org
 fas3-dev.fedorainfracloud.org
-#fed-cloud01.cloud.fedoraproject.org
-#fed-cloud02.cloud.fedoraproject.org
-fed-cloud03.cloud.fedoraproject.org
-fed-cloud04.cloud.fedoraproject.org
-fed-cloud05.cloud.fedoraproject.org
-fed-cloud06.cloud.fedoraproject.org
-fed-cloud07.cloud.fedoraproject.org
-fed-cloud08.cloud.fedoraproject.org
-fed-cloud09.cloud.fedoraproject.org
-#fed-cloud10.cloud.fedoraproject.org
-#fed-cloud11.cloud.fedoraproject.org
-fed-cloud12.cloud.fedoraproject.org
-fed-cloud13.cloud.fedoraproject.org
-#fed-cloud14.cloud.fedoraproject.org
-fed-cloud15.cloud.fedoraproject.org
-#fed-cloud16.cloud.fedoraproject.org
-#fed-cloud-ppc01.cloud.fedoraproject.org
-fed-cloud-ppc02.cloud.fedoraproject.org
 fedimg-dev.fedorainfracloud.org
 fedora-bootstrap.fedorainfracloud.org
 glittergallery-dev.fedorainfracloud.org
diff --git a/inventory/host_vars/virthost-aarch64-os01.fedorainfracloud.org b/inventory/host_vars/virthost-aarch64-os01.fedorainfracloud.org
index fb053017f6..2e315bf351 100644
--- a/inventory/host_vars/virthost-aarch64-os01.fedorainfracloud.org
+++ b/inventory/host_vars/virthost-aarch64-os01.fedorainfracloud.org
@@ -1,12 +1,18 @@
 ---
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
+freezes: false
+fas_client_groups: sysadmin-cloud,sysadmin-main
+sudoers: "{{ private }}/files/sudo/sysadmin-cloud"
 datacenter: cloud
 br0_ip: 38.145.48.26
 br0_nm: 255.255.254.0
 gw: 38.145.49.254
 dns: 8.8.8.8
-postfix_group: vpn
+
+postfix_group: cloud
 vpn: false
 copr_build_virthost: true
-nrpe: false
+#nrpe: false
+freezes: false
+
+nrpe_procs_warn: 900
+nrpe_procs_crit: 1000
diff --git a/inventory/host_vars/virthost-aarch64-os02.fedorainfracloud.org b/inventory/host_vars/virthost-aarch64-os02.fedorainfracloud.org
index 15cd466d8b..bb519798ea 100644
--- a/inventory/host_vars/virthost-aarch64-os02.fedorainfracloud.org
+++ b/inventory/host_vars/virthost-aarch64-os02.fedorainfracloud.org
@@ -1,4 +1,8 @@
 ---
+freezes: false
+fas_client_groups: sysadmin-cloud,sysadmin-main
+sudoers: "{{ private }}/files/sudo/sysadmin-cloud"
+
 nrpe_procs_warn: 900
 nrpe_procs_crit: 1000
 datacenter: cloud
@@ -6,7 +10,12 @@ br0_ip: 38.145.48.27
 br0_nm: 255.255.254.0
 gw: 38.145.49.254
 dns: 8.8.8.8
-postfix_group: vpn
+
+postfix_group: cloud
 vpn: false
 copr_build_virthost: true
-nrpe: false
+#nrpe: false
+freezes: false
+
+nrpe_procs_warn: 900
+nrpe_procs_crit: 1000