From: Zack Cerza <zack@redhat.com>
Date: Fri, 22 Sep 2017 21:32:43 +0000 (-0600)
Subject: Fix undefined collectd vars
X-Git-Tag: v1.0~15^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F125%2Fhead;p=cephmetrics.git

Fix undefined collectd vars

We regressed by moving the definition of a couple of these vars. Set
them in a separate task file to avoid this in the future.

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

diff --git a/ansible/roles/ceph-collectd/tasks/configure_collectd.yml b/ansible/roles/ceph-collectd/tasks/configure_collectd.yml
index 97acfac..9a295db 100644
--- a/ansible/roles/ceph-collectd/tasks/configure_collectd.yml
+++ b/ansible/roles/ceph-collectd/tasks/configure_collectd.yml
@@ -1,12 +1,4 @@
 ---
-- name: Set collectd_conf
-  set_fact:
-    collectd_conf: "/etc/{{ 'collectd/' if ansible_pkg_mgr == 'apt' else '' }}collectd.conf"
-
-- name: Set collectd_conf_d
-  set_fact:
-    collectd_conf_d: "/etc/collectd{{ '/collectd.conf' if ansible_pkg_mgr == 'apt' else '' }}.d"
-
 - name: Ship collectd.conf
   copy:
     src: files/etc/collectd.conf
diff --git a/ansible/roles/ceph-collectd/tasks/install_collectd_plugins.yml b/ansible/roles/ceph-collectd/tasks/install_collectd_plugins.yml
index 5af7367..8b4e61b 100644
--- a/ansible/roles/ceph-collectd/tasks/install_collectd_plugins.yml
+++ b/ansible/roles/ceph-collectd/tasks/install_collectd_plugins.yml
@@ -1,12 +1,4 @@
 ---
-- name: Set collectd_dir
-  set_fact:
-    collectd_dir: "/usr/lib{{ '64' if ansible_pkg_mgr == 'yum' else '' }}/collectd"
-
-- name: Set collectd_cephmetrics_dir
-  set_fact:
-    collectd_cephmetrics_dir: "{{ collectd_dir }}/cephmetrics"
-
 - name: Create collectors directory
   file:
     name: "{{ collectd_cephmetrics_dir }}/collectors"
diff --git a/ansible/roles/ceph-collectd/tasks/main.yml b/ansible/roles/ceph-collectd/tasks/main.yml
index afd77ed..b56b81a 100644
--- a/ansible/roles/ceph-collectd/tasks/main.yml
+++ b/ansible/roles/ceph-collectd/tasks/main.yml
@@ -15,6 +15,10 @@
   tags:
     - packages
 
+- include: set_collectd_vars.yml
+  tags:
+    - collectors
+
 - include: install_collectd_plugins.yml
   when:
     - not containerized_deployment
diff --git a/ansible/roles/ceph-collectd/tasks/set_collectd_vars.yml b/ansible/roles/ceph-collectd/tasks/set_collectd_vars.yml
new file mode 100644
index 0000000..8090240
--- /dev/null
+++ b/ansible/roles/ceph-collectd/tasks/set_collectd_vars.yml
@@ -0,0 +1,17 @@
+---
+- name: Set collectd_dir
+  set_fact:
+    collectd_dir: "/usr/lib{{ '64' if ansible_pkg_mgr == 'yum' else '' }}/collectd"
+
+- name: Set collectd_cephmetrics_dir
+  set_fact:
+    collectd_cephmetrics_dir: "{{ collectd_dir }}/cephmetrics"
+
+- name: Set collectd_conf
+  set_fact:
+    collectd_conf: "/etc/{{ 'collectd/' if ansible_pkg_mgr == 'apt' else '' }}collectd.conf"
+
+- name: Set collectd_conf_d
+  set_fact:
+    collectd_conf_d: "/etc/collectd{{ '/collectd.conf' if ansible_pkg_mgr == 'apt' else '' }}.d"
+