From: Zack Cerza <zack@redhat.com>
Date: Thu, 22 Jun 2017 19:35:19 +0000 (-0600)
Subject: ceph-collectd: Add devel_mode switch
X-Git-Tag: v1.0~67^2~1^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=15bfc54e8ddb510565d4ffce1cf99e25b82fe76d;p=cephmetrics.git

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 dfd72c6..55bc515 100644
--- 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 711e502..ea78afd 100644
--- 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 3f4a9bc..889284d 100644
--- 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 0dde408..9b4c577 100644
--- 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 e89cd75..1da3184 100644
--- 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: