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 the call to ceph-node-exporter 

This moves the call to ceph-node-exporter role after
ceph-container-common, otherwise it will try to run container before
docker or podman are installed.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/4013/head
Guillaume Abrioux 2019-05-17 17:34:09 +02:00
parent 0f89a3f7a5
commit 7c6a3bf825
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
site-container.yml.sample
View File

@ -114,11 +114,11 @@
tags: ['ceph_update_config'] tags: ['ceph_update_config']
- import_role: - import_role:
name: ceph-handler name: ceph-handler
- import_role:
name: ceph-container-common
- import_role: - import_role:
name: ceph-node-exporter name: ceph-node-exporter
when: dashboard_enabled when: dashboard_enabled
- import_role:
name: ceph-container-common
- import_role: - import_role:
name: ceph-config name: ceph-config
tags: ['ceph_update_config'] tags: ['ceph_update_config']
@ -161,11 +161,11 @@
tags: ['ceph_update_config'] tags: ['ceph_update_config']
- import_role: - import_role:
name: ceph-handler name: ceph-handler
- import_role:
name: ceph-container-common
- import_role: - import_role:
name: ceph-node-exporter name: ceph-node-exporter
when: dashboard_enabled when: dashboard_enabled
- import_role:
name: ceph-container-common
- import_role: - import_role:
name: ceph-config name: ceph-config
tags: ['ceph_update_config'] tags: ['ceph_update_config']
@ -203,11 +203,11 @@
tags: ['ceph_update_config'] tags: ['ceph_update_config']
- import_role: - import_role:
name: ceph-handler name: ceph-handler
- import_role:
name: ceph-container-common
- import_role: - import_role:
name: ceph-node-exporter name: ceph-node-exporter
when: dashboard_enabled when: dashboard_enabled
- import_role:
name: ceph-container-common
- import_role: - import_role:
name: ceph-config name: ceph-config
tags: ['ceph_update_config'] tags: ['ceph_update_config']
@ -245,11 +245,11 @@
tags: ['ceph_update_config'] tags: ['ceph_update_config']
- import_role: - import_role:
name: ceph-handler name: ceph-handler
- import_role:
name: ceph-container-common
- import_role: - import_role:
name: ceph-node-exporter name: ceph-node-exporter
when: dashboard_enabled when: dashboard_enabled
- import_role:
name: ceph-container-common
- import_role: - import_role:
name: ceph-config name: ceph-config
tags: ['ceph_update_config'] tags: ['ceph_update_config']
@ -287,11 +287,11 @@
tags: ['ceph_update_config'] tags: ['ceph_update_config']
- import_role: - import_role:
name: ceph-handler name: ceph-handler
- import_role:
name: ceph-container-common
- import_role: - import_role:
name: ceph-node-exporter name: ceph-node-exporter
when: dashboard_enabled when: dashboard_enabled
- import_role:
name: ceph-container-common
- import_role: - import_role:
name: ceph-config name: ceph-config
tags: ['ceph_update_config'] tags: ['ceph_update_config']
@ -329,11 +329,11 @@
tags: ['ceph_update_config'] tags: ['ceph_update_config']
- import_role: - import_role:
name: ceph-handler name: ceph-handler
- import_role:
name: ceph-container-common
- import_role: - import_role:
name: ceph-node-exporter name: ceph-node-exporter
when: dashboard_enabled when: dashboard_enabled
- import_role:
name: ceph-container-common
- import_role: - import_role:
name: ceph-config name: ceph-config
tags: ['ceph_update_config'] tags: ['ceph_update_config']
@ -371,11 +371,11 @@
tags: ['ceph_update_config'] tags: ['ceph_update_config']
- import_role: - import_role:
name: ceph-handler name: ceph-handler
- import_role:
name: ceph-container-common
- import_role: - import_role:
name: ceph-node-exporter name: ceph-node-exporter
when: dashboard_enabled when: dashboard_enabled
- import_role:
name: ceph-container-common
- import_role: - import_role:
name: ceph-config name: ceph-config
tags: ['ceph_update_config'] tags: ['ceph_update_config']
@ -413,12 +413,12 @@
tags: ['ceph_update_config'] tags: ['ceph_update_config']
- import_role: - import_role:
name: ceph-handler name: ceph-handler
- import_role:
name: ceph-node-exporter
when: dashboard_enabled
- import_role: - import_role:
name: ceph-container-common name: ceph-container-common
when: inventory_hostname == groups.get('clients', ['']) | first when: inventory_hostname == groups.get('clients', ['']) | first
- import_role:
name: ceph-node-exporter
when: dashboard_enabled
- import_role: - import_role:
name: ceph-config name: ceph-config
tags: ['ceph_update_config'] tags: ['ceph_update_config']
@ -458,11 +458,11 @@
tags: ['ceph_update_config'] tags: ['ceph_update_config']
- import_role: - import_role:
name: ceph-handler name: ceph-handler
- import_role:
name: ceph-container-common
- import_role: - import_role:
name: ceph-node-exporter name: ceph-node-exporter
when: dashboard_enabled when: dashboard_enabled
- import_role:
name: ceph-container-common
- import_role: - import_role:
name: ceph-config name: ceph-config
tags: ['ceph_update_config'] tags: ['ceph_update_config']
@ -523,10 +523,10 @@
tags: ['ceph_update_config'] tags: ['ceph_update_config']
- import_role: - import_role:
name: ceph-handler name: ceph-handler
- import_role:
name: ceph-node-exporter
- import_role: - import_role:
name: ceph-container-common name: ceph-container-common
- import_role:
name: ceph-node-exporter
- import_role: - import_role:
name: ceph-config name: ceph-config
tags: ['ceph_update_config'] tags: ['ceph_update_config']