common: Install a few additional packages for NRPE

check_load nagios plugin needs to be installed on RHEL and CentOS

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

diff --git a/roles/common/README.rst b/roles/common/README.rst
index 956ffed8e36faa7a975d8af1396f4970cc81f9a4..1c561e82834b23656688bf357d7eb358d76630b2 100644 (file)
--- a/roles/common/README.rst
+++ b/roles/common/README.rst
@@ -65,6 +65,11 @@ tasks OS-agnostic.  They variables are mostly self-explanatory and defined in
     # Where nagios plugins can be found
     nagios_plugins_directory: /usr/lib/nagios/plugins
 
+    # List of packages needed for NRPE use
+    nrpe_packages:
+      - nagios-nrpe-server
+      - nagios-plugins-basic
+
 Tags
 ++++
 

diff --git a/roles/common/tasks/nagios.yml b/roles/common/tasks/nagios.yml
index 1267c40356e441d4f4637e7fc4de22ff46c9de5c..6564c225a2db0fd14a18adcf95befa2ea92f7cbb 100644 (file)
--- a/roles/common/tasks/nagios.yml
+++ b/roles/common/tasks/nagios.yml
@@ -24,21 +24,25 @@
   with_items:
     - http://{{ mirror_host }}/lab-extras/rhel7/x86_64/nagios-common-4.0.8-2.el7.x86_64.rpm
     - http://{{ mirror_host }}/lab-extras/rhel7/x86_64/nrpe-2.15-7.el7.x86_64.rpm
+    - http://{{ mirror_host }}/lab-extras/rhel7/x86_64/nagios-plugins-2.0.3-3.el7.x86_64.rpm
+    - http://{{ mirror_host }}/lab-extras/rhel7/x86_64/nagios-plugins-load-2.0.3-3.el7.x86_64.rpm
   when: ansible_pkg_mgr == "yum" and
         have_epel.rc == 1
 
 - name: Install nrpe package and dependencies (RHEL/CentOS)
   yum:
-    name: "{{ nrpe_service_name }}"
+    name: "{{ item }}"
     state: latest
     enablerepo: epel
+  with_items: "{{ nrpe_packages }}"
   when: ansible_pkg_mgr == "yum" and
         have_epel.rc == 0
 
 - name: Install nrpe package and dependencies (Ubuntu)
   apt:
-    name: "{{ nrpe_service_name }}"
+    name: "{{ item }}"
     state: latest
+  with_items: "{{ nrpe_packages }}"
   when: ansible_pkg_mgr == "apt"
 
 - name: Upload nagios sudoers.d for raid utilities.

diff --git a/roles/common/vars/apt_systems.yml b/roles/common/vars/apt_systems.yml
index 066314ddcf0daced23987fe40b6326a6d77e1619..8c2ba5c94bbdd098bf1f299ad0bee6e0b026d0ef 100644 (file)
--- a/roles/common/vars/apt_systems.yml
+++ b/roles/common/vars/apt_systems.yml
@@ -3,3 +3,7 @@ nrpe_service_name: nagios-nrpe-server
 nrpe_user: nagios
 nrpe_group: nagios
 nagios_plugins_directory: /usr/lib/nagios/plugins
+
+nrpe_packages:
+  - nagios-nrpe-server
+  - nagios-plugins-basic

diff --git a/roles/common/vars/yum_systems.yml b/roles/common/vars/yum_systems.yml
index d7b4ed20cbee8920f68bc1496132fe0c6db49c12..b85f0086bf831be5abfcf797c046ab7148bd6782 100644 (file)
--- a/roles/common/vars/yum_systems.yml
+++ b/roles/common/vars/yum_systems.yml
@@ -3,3 +3,9 @@ nrpe_service_name: nrpe
 nrpe_user: nrpe
 nrpe_group: nrpe
 nagios_plugins_directory: /usr/lib64/nagios/plugins
+
+nrpe_packages:
+  - nagios-common
+  - nrpe
+  - nagios-plugins
+  - nagios-plugins-load