From 10e6b3a43ddafc5034dde900f8832357d345b856 Mon Sep 17 00:00:00 2001
From: Zack Cerza <zack@redhat.com>
Date: Thu, 22 Jun 2017 13:44:17 -0600
Subject: [PATCH] ceph-collectd: Split out collectd configuration

Signed-off-by: Zack Cerza <zack@redhat.com>
---
 .../tasks/configure_collectd.yml              | 26 +++++++++++++++++++
 .../tasks/install_collectd_plugins.yml        | 26 -------------------
 ansible/roles/ceph-collectd/tasks/main.yml    |  6 +++++
 3 files changed, 32 insertions(+), 26 deletions(-)
 create mode 100644 ansible/roles/ceph-collectd/tasks/configure_collectd.yml

diff --git a/ansible/roles/ceph-collectd/tasks/configure_collectd.yml b/ansible/roles/ceph-collectd/tasks/configure_collectd.yml
new file mode 100644
index 0000000..711e502
--- /dev/null
+++ b/ansible/roles/ceph-collectd/tasks/configure_collectd.yml
@@ -0,0 +1,26 @@
+---
+- name: Ship collectd.conf
+  copy:
+    src: files/etc/collectd.conf
+    dest: /etc/
+  notify: Restart collectd
+
+- name: Ship /etc/collectd.d
+  copy:
+    src: files/etc/collectd.d
+    dest: /etc/
+  notify: Restart collectd
+
+- name: Set hostname in write_graphite.conf
+  replace:
+    dest: "/etc/collectd.d/write_graphite.conf"
+    regexp: 'Host ".*"'
+    replace: "Host \"{{ groups['ceph-grafana'][0] }}\""
+  notify: Restart collectd
+
+- name: Set cluster name in cephmetrics.conf
+  replace:
+    dest: /etc/collectd.d/cephmetrics.conf
+    regexp: 'ClusterName ".*"'
+    replace: 'ClusterName "{{ cluster }}"'
+  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 6b29498..0b0de15 100644
--- a/ansible/roles/ceph-collectd/tasks/install_collectd_plugins.yml
+++ b/ansible/roles/ceph-collectd/tasks/install_collectd_plugins.yml
@@ -18,29 +18,3 @@
     src: files/cephmetrics.py
     dest: /usr/lib64/collectd/python-plugins/
   notify: Restart collectd
-
-- name: Ship collectd.conf
-  copy:
-    src: files/etc/collectd.conf
-    dest: /etc/
-  notify: Restart collectd
-
-- name: Ship /etc/collectd.d
-  copy:
-    src: files/etc/collectd.d
-    dest: /etc/
-  notify: Restart collectd
-
-- name: Set hostname in write_graphite.conf
-  replace:
-    dest: "/etc/collectd.d/write_graphite.conf"
-    regexp: 'Host ".*"'
-    replace: "Host \"{{ groups['ceph-grafana'][0] }}\""
-  notify: Restart collectd
-
-- name: Set cluster name in cephmetrics.conf
-  replace:
-    dest: /etc/collectd.d/cephmetrics.conf
-    regexp: 'ClusterName ".*"'
-    replace: 'ClusterName "{{ cluster }}"'
-  notify: Restart collectd
diff --git a/ansible/roles/ceph-collectd/tasks/main.yml b/ansible/roles/ceph-collectd/tasks/main.yml
index 5eb334e..0dde408 100644
--- a/ansible/roles/ceph-collectd/tasks/main.yml
+++ b/ansible/roles/ceph-collectd/tasks/main.yml
@@ -10,6 +10,12 @@
     - packages
 
 - include: install_collectd_plugins.yml
+  when:
+    - not containerized_deployment
+  tags:
+    - collectors
+
+- include: configure_collectd.yml
   when: not containerized_deployment
   tags:
     - collectors
-- 
2.47.3