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

playbook: use blocks for grafana-server section 

use a block in grafana-server section to avoid duplicate condition.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit be4a565612)
pull/3999/head
Guillaume Abrioux 2019-05-15 14:11:00 +02:00
parent fe5bcc2f9f
commit 406dd2880c
2 changed files with 44 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
site-container.yml.sample
View File

@ -514,30 +514,24 @@
- hosts: grafana-server - hosts: grafana-server
become: true become: true
tasks: tasks:
- block:
- import_role: - import_role:
name: ceph-defaults name: ceph-defaults
tags: ['ceph_update_config'] tags: ['ceph_update_config']
when: dashboard_enabled
- import_role: - import_role:
name: ceph-facts name: ceph-facts
tags: ['ceph_update_config'] tags: ['ceph_update_config']
when: dashboard_enabled
- import_role: - import_role:
name: ceph-handler name: ceph-handler
when: dashboard_enabled
- import_role: - import_role:
name: ceph-node-exporter name: ceph-node-exporter
when: dashboard_enabled
- import_role: - import_role:
name: ceph-common name: ceph-common
when: dashboard_enabled
- import_role: - import_role:
name: ceph-config name: ceph-config
tags: ['ceph_update_config'] tags: ['ceph_update_config']
when: dashboard_enabled
- import_role: - import_role:
name: ceph-prometheus name: ceph-prometheus
when: dashboard_enabled
- import_role: - import_role:
name: ceph-grafana name: ceph-grafana
when: dashboard_enabled when: dashboard_enabled
@ -545,10 +539,10 @@
- hosts: '{{ (groups["mgrs"] | default(groups["mons"]))[0] }}' - hosts: '{{ (groups["mgrs"] | default(groups["mons"]))[0] }}'
become: true become: true
tasks: tasks:
- block:
- import_role: - import_role:
name: ceph-defaults name: ceph-defaults
tags: ['ceph_update_config'] tags: ['ceph_update_config']
when: dashboard_enabled
- import_role: - import_role:
name: ceph-dashboard name: ceph-dashboard
when: dashboard_enabled when: dashboard_enabled

7
site.yml.sample
View File

@ -507,27 +507,22 @@
- hosts: grafana-server - hosts: grafana-server
become: true become: true
tasks: tasks:
- block:
- import_role: - import_role:
name: ceph-defaults name: ceph-defaults
tags: ['ceph_update_config'] tags: ['ceph_update_config']
when: dashboard_enabled
- import_role: - import_role:
name: ceph-facts name: ceph-facts
tags: ['ceph_update_config'] tags: ['ceph_update_config']
when: dashboard_enabled
- import_role: - import_role:
name: ceph-handler name: ceph-handler
when: dashboard_enabled
- import_role: - import_role:
name: ceph-common name: ceph-common
when: dashboard_enabled
- import_role: - import_role:
name: ceph-config name: ceph-config
tags: ['ceph_update_config'] tags: ['ceph_update_config']
when: dashboard_enabled
- import_role: - import_role:
name: ceph-prometheus name: ceph-prometheus
when: dashboard_enabled
- import_role: - import_role:
name: ceph-grafana name: ceph-grafana
when: dashboard_enabled when: dashboard_enabled