From: David Galloway <dgallowa@redhat.com>
Date: Tue, 15 Mar 2016 22:33:55 +0000 (-0400)
Subject: testnodes: Disable ssl requirement for nrpe on rpm-based distros
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a537adb16e87741223e63c28e28ec7c13e135602;p=ceph-cm-ansible.git

testnodes: Disable ssl requirement for nrpe on rpm-based distros

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

diff --git a/roles/testnode/tasks/nagios.yml b/roles/testnode/tasks/nagios.yml
index ac8bdb65..7be89e38 100644
--- a/roles/testnode/tasks/nagios.yml
+++ b/roles/testnode/tasks/nagios.yml
@@ -8,13 +8,19 @@
     mode: 0440
     validate: visudo -cf %s
 
-- name: Configure nagios nrpe settings.
-  template:
-    src: nagios/nagios-nrpe-server
-    dest: "/etc/default/{{ nrpe_service_name }}"
-    owner: root
-    group: root
-    mode: 0644
+- name: Configure nagios nrpe settings (Ubuntu)
+  lineinfile:
+    dest: /etc/default/{{ nrpe_service_name }}
+    regexp: "^DAEMON_OPTS"
+    line: "DAEMON_OPTS=\"--no-ssl\""
+  when: ansible_pkg_mgr == "apt"
+
+- name: Configure nagios nrpe settings (RHEL/CentOS)
+  lineinfile:
+    dest: /etc/sysconfig/{{ nrpe_service_name }}
+    regexp: "^NRPE_SSL_OPT"
+    line: "NRPE_SSL_OPT=\"-n\""
+  when: ansible_pkg_mgr == "yum"
 
 - name: Upload nagios nrpe config.
   template:
diff --git a/roles/testnode/templates/nagios/nagios-nrpe-server b/roles/testnode/templates/nagios/nagios-nrpe-server
deleted file mode 100644
index 4d92a125..00000000
--- a/roles/testnode/templates/nagios/nagios-nrpe-server
+++ /dev/null
@@ -1 +0,0 @@
-DAEMON_OPTS="--no-ssl"