From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Thu, 23 May 2019 08:26:36 +0000 (+0200)
Subject: dashboard: move ceph-grafana-dashboards package installation
X-Git-Tag: v4.0.0rc10~32
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=bcfed47009319ced2e5f2445afa0baca99dff419;p=ceph-ansible.git

dashboard: move ceph-grafana-dashboards package installation

This commit moves the package installation into ceph-dashboard role.
This is needed to install ceph dasboard json file in
`/etc/grafana/dashboards/ceph-dashboard/`.

Closes: #4026

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 6e2e30db54bafb271f7f5bd087f426e5762d9e7e)
---

diff --git a/roles/ceph-grafana/tasks/configure_grafana.yml b/roles/ceph-grafana/tasks/configure_grafana.yml
index e45a7c74e..7aa444ab7 100644
--- a/roles/ceph-grafana/tasks/configure_grafana.yml
+++ b/roles/ceph-grafana/tasks/configure_grafana.yml
@@ -1,4 +1,14 @@
 ---
+- name: install ceph-grafana-dashboards package on RedHat or SUSE
+  package:
+    name: ceph-grafana-dashboards
+    state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
+  register: result
+  until: result is succeeded
+  when:
+    - not containerized_deployment
+    - ansible_os_family in ['RedHat', 'Suse']
+
 - name: make sure grafana is down
   service:
     name: grafana-server
diff --git a/roles/ceph-mgr/tasks/pre_requisite.yml b/roles/ceph-mgr/tasks/pre_requisite.yml
index 12051ae64..f2cd100a1 100644
--- a/roles/ceph-mgr/tasks/pre_requisite.yml
+++ b/roles/ceph-mgr/tasks/pre_requisite.yml
@@ -7,15 +7,6 @@
   until: result is succeeded
   when: ansible_os_family in ['RedHat', 'Suse']
 
-- name: install ceph-grafana-dashboards package on RedHat or SUSE
-  package:
-    name: ceph-grafana-dashboards
-    state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  register: result
-  until: result is succeeded
-  when:
-    - ansible_os_family in ['RedHat', 'Suse']
-
 - name: install ceph-mgr packages for debian
   apt:
     name: '{{ ceph_mgr_packages }}'