From acc2da9fb3b29e7822549bfee37e5106d3f67f3b Mon Sep 17 00:00:00 2001
From: Zack Cerza <zack@redhat.com>
Date: Thu, 22 Jun 2017 14:07:58 -0600
Subject: [PATCH] ceph-grafana: Add devel_mode switch

This will be set to False for production deployments.

Signed-off-by: Zack Cerza <zack@redhat.com>
---
 ansible/roles/ceph-grafana/defaults/main.yml         |  1 +
 .../roles/ceph-grafana/tasks/configure_grafana.yml   | 12 +++++++++---
 .../roles/ceph-grafana/tasks/install_packages.yml    |  7 +++++++
 ansible/roles/ceph-grafana/tasks/setup_repos.yml     |  2 ++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ansible/roles/ceph-grafana/defaults/main.yml b/ansible/roles/ceph-grafana/defaults/main.yml
index 817e2e7..ca033bb 100644
--- a/ansible/roles/ceph-grafana/defaults/main.yml
+++ b/ansible/roles/ceph-grafana/defaults/main.yml
@@ -1,6 +1,7 @@
 ---
 containerized_deployment: false
 use_epel: false
+devel_mode: true
 graphite:
   port: "{{ graphite_port | default('8080') }}"
   user: admin
diff --git a/ansible/roles/ceph-grafana/tasks/configure_grafana.yml b/ansible/roles/ceph-grafana/tasks/configure_grafana.yml
index a0110db..a25e01c 100644
--- a/ansible/roles/ceph-grafana/tasks/configure_grafana.yml
+++ b/ansible/roles/ceph-grafana/tasks/configure_grafana.yml
@@ -72,16 +72,19 @@
   notify: Restart Grafana
 
 - include: grafana_plugins.yml
+  when: devel_mode
 
 - name: Ship dashboard templates
   copy:
     src: files/dashboards
     dest: /tmp/
+  when: devel_mode
 
 - name: Ship dashUpdater.py
   copy:
     src: files/dashUpdater.py
     dest: /tmp/dashUpdater.py
+  when: devel_mode
 
 - name: Write dashboard.yml
   template:
@@ -89,6 +92,9 @@
     dest: /tmp/dashboard.yml
 
 - name: Push dashboards to Grafana
-  command: python dashUpdater.py -D ./dashboards
-  args:
-    chdir: /tmp
+  command: python /tmp/dashUpdater.py -c /tmp/dashboard.yml -D /tmp/dashboards
+  when: devel_mode
+
+- name: Push dashboards to Grafana
+  command: /usr/libexec/cephmetrics/dashUpdater.py -c /tmp/dashboard.yml -D /usr/share/cephmetrics/dashboards
+  when: not devel_mode
diff --git a/ansible/roles/ceph-grafana/tasks/install_packages.yml b/ansible/roles/ceph-grafana/tasks/install_packages.yml
index 8e699d5..95ea1af 100644
--- a/ansible/roles/ceph-grafana/tasks/install_packages.yml
+++ b/ansible/roles/ceph-grafana/tasks/install_packages.yml
@@ -9,3 +9,10 @@
     - graphite-web
     - python-carbon
     - grafana
+  when: devel_mode
+
+- name: Install cephmetrics
+  package:
+    name: cephmetrics
+    state: latest
+  when: not devel_mode
diff --git a/ansible/roles/ceph-grafana/tasks/setup_repos.yml b/ansible/roles/ceph-grafana/tasks/setup_repos.yml
index b7f0e2e..11ba3d8 100644
--- a/ansible/roles/ceph-grafana/tasks/setup_repos.yml
+++ b/ansible/roles/ceph-grafana/tasks/setup_repos.yml
@@ -5,6 +5,7 @@
     state: "{{ 'present' if use_epel else 'absent' }}"
   when:
     - ansible_pkg_mgr == "yum"
+    - devel_mode
 
 - name: Install chacra repo
   copy:
@@ -29,6 +30,7 @@
   when:
     - ansible_pkg_mgr == 'yum'
     - use_epel
+    - devel_mode
 
 - name: Remove Grafana repo
   file:
-- 
2.47.3