Move collectd module path to avoid conflicts

Signed-off-by: Boris Ranto <branto@redhat.com>

diff --git a/ansible/roles/ceph-collectd/tasks/configure_collectd.yml b/ansible/roles/ceph-collectd/tasks/configure_collectd.yml
index ea78afd792be1f8e660ca1d7ce95207e05057f8b..711e502d662b5f269b3df3d946a13531cfb0e929 100644 (file)
--- a/ansible/roles/ceph-collectd/tasks/configure_collectd.yml
+++ b/ansible/roles/ceph-collectd/tasks/configure_collectd.yml
@@ -24,11 +24,3 @@
     regexp: 'ClusterName ".*"'
     replace: 'ClusterName "{{ cluster }}"'
   notify: Restart collectd
-
-- name: Set plugin path in cephmetrics.conf
-  replace:
-    dest: /etc/collectd.d/cephmetrics.conf
-    regexp: 'ModulePath ".*"'
-    replace: 'ModulePath "/usr/lib64/collectd/cephmetrics"'
-  when: not devel_mode
-  notify: Restart collectd

diff --git a/ansible/roles/ceph-collectd/tasks/install_collectd_plugins.yml b/ansible/roles/ceph-collectd/tasks/install_collectd_plugins.yml
index 0b0de15fd6eaad40ed706698be10bae55416dab2..5cf05e527177d365509bcc10da01ef63065156ae 100644 (file)
--- a/ansible/roles/ceph-collectd/tasks/install_collectd_plugins.yml
+++ b/ansible/roles/ceph-collectd/tasks/install_collectd_plugins.yml
@@ -1,20 +1,20 @@
 ---
 - set_fact:
-    collectors_dir: /usr/lib64/collectd/python-plugins/collectors
+    collectd_dir: /usr/lib64/collectd/cephmetrics
 
 - name: Create collectors directory
   file:
-    name: "{{ collectors_dir }}"
+    name: "{{ collectd_dir }}/collectors"
     state: directory
 
 - name: Ship collector plugins
   copy:
     src: files/collectors/
-    dest: "{{ collectors_dir }}"
+    dest: "{{ collectd_dir }}/collectors"
   notify: Restart collectd
 
 - name: Ship cephmetrics.py
   copy:
     src: files/cephmetrics.py
-    dest: /usr/lib64/collectd/python-plugins/
+    dest: "{{ collectd_dir }}"
   notify: Restart collectd

diff --git a/etc/collectd.d/cephmetrics.conf b/etc/collectd.d/cephmetrics.conf
index d671c0a6c433c5c6497d65f92e1162b2f64d7f01..b669f2de4e3137f7909767e8a280e1d050d33e9d 100644 (file)
--- a/etc/collectd.d/cephmetrics.conf
+++ b/etc/collectd.d/cephmetrics.conf
@@ -1,7 +1,7 @@
 LoadPlugin "python"
 
 <Plugin python>
-    ModulePath "/usr/lib64/collectd/python-plugins"
+    ModulePath "/usr/lib64/collectd/cephmetrics"
 
     Import "cephmetrics"
     <Module cephmetrics>