Move tasks related to disk monitoring scipts to main.yml

Looks like we upload these for all distros, so moving them out of the
redhat specific setup tasks.  I've also put them into their own yaml
file.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/roles/common/tasks/disk_monitoring.yml b/roles/common/tasks/disk_monitoring.yml
new file mode 100644 (file)
index 0000000..d48e229
--- /dev/null
+++ b/roles/common/tasks/disk_monitoring.yml
@@ -0,0 +1,33 @@
+---
+# We use these scripts to check to see if any of our test nodes have bad disks
+
+- name: Upload megacli and cli64 for raid monitoring and smart.pl to /usr/sbin/.
+  copy:
+    src: "../files/sbin/{{ item }}"
+    dest: "/usr/sbin/{{ item }}"
+    owner: root
+    group: root
+    mode: 0755
+  with_items:
+    - megacli
+    - cli64
+
+- name: Create /usr/libexec.
+  file:
+    path: /usr/libexec
+    owner: root
+    group: root
+    mode: 0755
+    state: directory
+
+- name: Upload custom netsaint scripts for raid/disk/smart/monitoring to /usr/libexec/.
+  copy:
+    src: "../files/libexec/{{ item }}"
+    dest: "/usr/libexec/{{ item }}"
+    owner: root
+    group: root
+    mode: 0755
+  with_items:
+    - smart.pl
+    - raid.pl
+    - diskusage.pl

diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 9a84077e4cd12544deb1681d7c331d8915c28b77..15b92e606842d94826477ac948c5e868d0f34005 100644 (file)
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -20,6 +20,11 @@
   tags:
     - ntp-client
 
+# upload custom disk monitoring scripts
+- include: disk_monitoring.yml
+  tags:
+    - monitoring-scripts
+
 # configure red hat specific things
 - include: setup-redhat.yml
   when: ansible_os_family == 'RedHat'

diff --git a/roles/common/tasks/setup-redhat.yml b/roles/common/tasks/setup-redhat.yml
index 8e04f37ecf3928dcbce754ac14cce359c0d2a630..b25edd7ffb279ee0ba426e4ba80b10475904c8c4 100644 (file)
--- a/roles/common/tasks/setup-redhat.yml
+++ b/roles/common/tasks/setup-redhat.yml
@@ -37,37 +37,6 @@
     name: ubuntu
     group: kvm
 
-- name: Upload megacli and cli64 for raid monitoring and smart.pl to /usr/sbin/.
-  copy:
-    src: "../files/sbin/{{ item }}"
-    dest: "/usr/sbin/{{ item }}"
-    owner: root
-    group: root
-    mode: 0755
-  with_items:
-    - megacli
-    - cli64
-
-- name: Create /usr/libexec.
-  file:
-    path: /usr/libexec
-    owner: root
-    group: root
-    mode: 0755
-    state: directory
-
-- name: Upload custom netsaint scripts for raid/disk/smart/monitoring to /usr/libexec/.
-  copy:
-    src: "../files/libexec/{{ item }}"
-    dest: "/usr/libexec/{{ item }}"
-    owner: root
-    group: root
-    mode: 0755
-  with_items:
-    - smart.pl
-    - raid.pl
-    - diskusage.pl
-
 - name: Upload rhel version specific sshd_config.
   template:
     src: "ssh/sshd_config_rhel_{{ ansible_distribution_version }}"