From 281ea5110c7215bbb2f1f26dd215c8d42b99aa5c Mon Sep 17 00:00:00 2001 From: dgalloway Date: Wed, 23 Dec 2015 18:00:58 -0500 Subject: [PATCH] testnodes: Move nagios task to be OS agnostic Also moved disk_monitoring task since it's related to nagios Signed-off-by: David Galloway --- roles/testnode/tasks/apt_systems.yml | 4 ---- roles/testnode/tasks/main.yml | 15 ++++++++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/roles/testnode/tasks/apt_systems.yml b/roles/testnode/tasks/apt_systems.yml index b10b888..a0fabf4 100644 --- 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 eeb6019..e06aba5 100644 --- 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: -- 2.39.5