ceph-collectd: Add devel_mode switch

This will be set to False for production deployments.

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/ansible/roles/ceph-collectd/defaults/main.yml b/ansible/roles/ceph-collectd/defaults/main.yml
index dfd72c6e91f6caae69f950cd3433353503c77232..55bc515a54ccebb49a6bf3e9b4f586a6236b8d35 100644 (file)
--- a/ansible/roles/ceph-collectd/defaults/main.yml
+++ b/ansible/roles/ceph-collectd/defaults/main.yml
@@ -2,3 +2,4 @@
 containerized_deployment: false
 cluster: ceph
 use_epel: false
+devel_mode: true

diff --git a/ansible/roles/ceph-collectd/tasks/configure_collectd.yml b/ansible/roles/ceph-collectd/tasks/configure_collectd.yml
index 711e502d662b5f269b3df3d946a13531cfb0e929..ea78afd792be1f8e660ca1d7ce95207e05057f8b 100644 (file)
--- a/ansible/roles/ceph-collectd/tasks/configure_collectd.yml
+++ b/ansible/roles/ceph-collectd/tasks/configure_collectd.yml
@@ -24,3 +24,11 @@
     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_packages.yml b/ansible/roles/ceph-collectd/tasks/install_packages.yml
index 3f4a9bcc131377c66b03811476c4b652b4891f2f..889284d3def3fc7224da4f297ecabc36455cf618 100644 (file)
--- a/ansible/roles/ceph-collectd/tasks/install_packages.yml
+++ b/ansible/roles/ceph-collectd/tasks/install_packages.yml
@@ -3,13 +3,27 @@
   package:
     name: collectd
     state: latest
+  when:
+    - devel_mode
   notify: Restart collectd
 
 - name: Install collectd-python
   package:
     name: collectd-python
     state: latest
-  when: ansible_pkg_mgr == "yum" and not use_epel
+  when:
+    - ansible_pkg_mgr == "yum"
+    - devel_mode
+    - not use_epel
+  notify: Restart collectd
+
+- name: Install cephmetrics-collectors
+  package:
+    name: cephmetrics-collectors
+    state: latest
+  when:
+    - ansible_pkg_mgr == "yum"
+    - not devel_mode
   notify: Restart collectd
 
 - name: Install dependencies for collector plugins
@@ -23,3 +37,7 @@
     - python-rados
     # For the ceph_daemon python module
     - ceph-common
+  when:
+    - ansible_pkg_mgr == "yum"
+    - devel_mode
+  notify: Restart collectd

diff --git a/ansible/roles/ceph-collectd/tasks/main.yml b/ansible/roles/ceph-collectd/tasks/main.yml
index 0dde408b9ace03c652f07920b8e9c2fe67ff3d85..9b4c577329c6660ceeb1d2cb9250baeb06db3a35 100644 (file)
--- a/ansible/roles/ceph-collectd/tasks/main.yml
+++ b/ansible/roles/ceph-collectd/tasks/main.yml
@@ -12,6 +12,7 @@
 - include: install_collectd_plugins.yml
   when:
     - not containerized_deployment
+    - devel_mode
   tags:
     - collectors
 

diff --git a/ansible/roles/ceph-collectd/tasks/setup_repos.yml b/ansible/roles/ceph-collectd/tasks/setup_repos.yml
index e89cd7519a8e918c911447fe481a4d638a0274b4..1da3184929cd1bf9eb8a037bdd302f06d88633f7 100644 (file)
--- a/ansible/roles/ceph-collectd/tasks/setup_repos.yml
+++ b/ansible/roles/ceph-collectd/tasks/setup_repos.yml
@@ -3,7 +3,9 @@
   yum:
     name: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm"
     state: "{{ 'present' if use_epel else 'absent' }}"
-  when: ansible_pkg_mgr == "yum"
+  when:
+    - devel_mode
+    - ansible_pkg_mgr == "yum"
 
 - name: Install chacra repo
   copy: