testnodes: Move nagios task to be OS agnostic

Also moved disk_monitoring task since it's related to nagios

Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/roles/testnode/tasks/apt_systems.yml b/roles/testnode/tasks/apt_systems.yml
index b10b88894389fd71e7536e735011aad8454c46d6..a0fabf499b9d88c63c1ecd768534397ed94ff5d8 100644 (file)
--- a/roles/testnode/tasks/apt_systems.yml
+++ b/roles/testnode/tasks/apt_systems.yml
@@ -63,10 +63,6 @@
     groups: fuse,kvm,disk
     append: yes
 
-- include: nagios.yml
-  tags:
-    - nagios
-
 - include: static_ip.yml
   when: "'vps' not in group_names"
 

diff --git a/roles/testnode/tasks/main.yml b/roles/testnode/tasks/main.yml
index eeb6019b888832fabc9c11d43f62ae5794bb45f8..e06aba50d4815dc1517387fda254c8e3591f1f66 100644 (file)
--- a/roles/testnode/tasks/main.yml
+++ b/roles/testnode/tasks/main.yml
@@ -23,11 +23,6 @@
   tags:
     - hostname
 
-# upload custom disk monitoring scripts
-- include: disk_monitoring.yml
-  tags:
-    - monitoring-scripts
-
 # partition drives, if any are requested
 - include: drive_partitioning.yml
   when: drive_to_partition is defined
@@ -67,6 +62,16 @@
 - include: setup-debian.yml
   when: ansible_distribution == "Debian"
 
+# upload custom disk monitoring scripts
+- include: disk_monitoring.yml
+  tags:
+    - monitoring-scripts
+
+# configure nagios
+- include: nagios.yml
+  tags:
+    - nagios
+
 # configure ntp
 - include: ntp.yml
   tags: