From 6e2e30db54bafb271f7f5bd087f426e5762d9e7e Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 23 May 2019 10:26:36 +0200 Subject: [PATCH] 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 --- roles/ceph-grafana/tasks/configure_grafana.yml | 10 ++++++++++ roles/ceph-mgr/tasks/pre_requisite.yml | 9 --------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/roles/ceph-grafana/tasks/configure_grafana.yml b/roles/ceph-grafana/tasks/configure_grafana.yml index bbb5ab224..d6d63b04a 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 }}'