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

dashboard: fix hosts sections in main playbook 

ceph-dashboard should be deployed on either a dedicated mgr node or a
mon if they are collocated.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit bdc870cbf5)
pull/4120/head
Guillaume Abrioux 2019-06-14 15:27:11 +02:00 committed by Dimitri Savineau
parent b1f8518ef9
commit 5748215325
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
site-container.yml.sample
View File

@ -522,30 +522,30 @@
become: true become: true
tasks: tasks:
- block: - block:
- import_role: - import_role:
name: ceph-defaults name: ceph-defaults
tags: ['ceph_update_config'] tags: ['ceph_update_config']
- import_role: - import_role:
name: ceph-facts name: ceph-facts
tags: ['ceph_update_config'] tags: ['ceph_update_config']
- import_role: - import_role:
name: ceph-handler name: ceph-handler
- import_role: - import_role:
name: ceph-container-engine name: ceph-container-engine
- import_role: - import_role:
name: ceph-container-common name: ceph-container-common
- import_role: - import_role:
name: ceph-node-exporter name: ceph-node-exporter
- import_role: - import_role:
name: ceph-config name: ceph-config
tags: ['ceph_update_config'] tags: ['ceph_update_config']
- import_role: - import_role:
name: ceph-prometheus name: ceph-prometheus
- import_role: - import_role:
name: ceph-grafana name: ceph-grafana
when: dashboard_enabled | bool when: dashboard_enabled | bool
- hosts: '{{ groups["grafana-server"][0] | default(groups["mgrs"][0]) | default(groups["mons"][0]) | default(omit) }}' - hosts: '{{ groups["mgrs"][0] | default(groups["mons"][0]) | default(omit) }}'
become: true become: true
tasks: tasks:
- block: - block:

14
site.yml.sample
View File

@ -560,13 +560,13 @@
name: ceph-grafana name: ceph-grafana
when: dashboard_enabled | bool when: dashboard_enabled | bool
- hosts: '{{ groups["grafana-server"][0] | default(groups["mgrs"][0]) | default(groups["mons"][0]) | default(omit) }}' - hosts: '{{ groups["mgrs"][0] | default(groups["mons"][0]) | default(omit) }}'
become: true become: true
tasks: tasks:
- import_role: - block:
name: ceph-defaults - import_role:
tags: ['ceph_update_config'] name: ceph-defaults
when: dashboard_enabled | bool tags: ['ceph_update_config']
- import_role: - import_role:
name: ceph-dashboard name: ceph-dashboard
when: dashboard_enabled | bool when: dashboard_enabled | bool