ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 6e2e30db54)
pull/4169/head
Guillaume Abrioux 2019-05-23 10:26:36 +02:00 committed by Dimitri Savineau
parent df0d146166
commit bcfed47009
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
roles/ceph-grafana/tasks/configure_grafana.yml
View File

@ -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 - name: make sure grafana is down
service: service:
name: grafana-server name: grafana-server

9
roles/ceph-mgr/tasks/pre_requisite.yml
View File

@ -7,15 +7,6 @@
until: result is succeeded until: result is succeeded
when: ansible_os_family in ['RedHat', 'Suse'] 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 - name: install ceph-mgr packages for debian
apt: apt:
name: '{{ ceph_mgr_packages }}' name: '{{ ceph_mgr_packages }}'