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

dashboard: do not call ceph-container-common from other role 

use site.yml to deploy ceph-container-common in order to install docker
even in non-containerized deployments since there's no RPM available to
deploy the differents applications needed for ceph-dashboard.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/3991/head
Guillaume Abrioux 2019-05-14 16:34:50 +02:00
parent 742bb6214c
commit cdff0da7d4
4 changed files with 17 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
roles/ceph-grafana/tasks/setup_container.yml
View File

@ -1,9 +1,4 @@
--- ---
- name: include ceph-container-common
include_role:
name: ceph-container-common
allow_duplicates: false
- name: create grafana user - name: create grafana user
user: user:
name: grafana name: grafana

5
roles/ceph-node-exporter/tasks/setup_container.yml
View File

@ -1,9 +1,4 @@
--- ---
- name: include ceph-container-common
include_role:
name: ceph-container-common
allow_duplicates: false
- name: make sure the node_exporter service is down - name: make sure the node_exporter service is down
service: service:
name: node_exporter name: node_exporter

5
roles/ceph-prometheus/tasks/setup_container.yml
View File

@ -1,9 +1,4 @@
--- ---
- name: include ceph-container-common
include_role:
name: ceph-container-common
allow_duplicates: false
- name: make sure the alertmanager service is down - name: make sure the alertmanager service is down
service: service:
name: alertmanager name: alertmanager

50
site.yml.sample
View File

@ -93,9 +93,6 @@
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-common name: ceph-common
- import_role: - import_role:
@ -138,9 +135,6 @@
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-common name: ceph-common
- import_role: - import_role:
@ -180,9 +174,6 @@
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-common name: ceph-common
- import_role: - import_role:
@ -222,9 +213,6 @@
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-common name: ceph-common
- import_role: - import_role:
@ -264,9 +252,6 @@
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-common name: ceph-common
- import_role: - import_role:
@ -306,9 +291,6 @@
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-common name: ceph-common
- import_role: - import_role:
@ -348,9 +330,6 @@
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-common name: ceph-common
- import_role: - import_role:
@ -390,9 +369,6 @@
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-common name: ceph-common
- import_role: - import_role:
@ -432,9 +408,6 @@
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-common name: ceph-common
- import_role: - import_role:
@ -476,9 +449,6 @@
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-common name: ceph-common
- import_role: - import_role:
@ -517,6 +487,23 @@
run_once: true run_once: true
when: not ceph_status.failed when: not ceph_status.failed
- hosts: all
become: true
tasks:
- block:
- import_role:
name: ceph-defaults
- import_role:
name: ceph-facts
- import_role:
name: ceph-handler
- import_role:
name: ceph-container-common
- import_role:
name: ceph-node-exporter
when: dashboard_enabled
- hosts: grafana-server - hosts: grafana-server
become: true become: true
tasks: tasks:
@ -531,9 +518,6 @@
- import_role: - import_role:
name: ceph-handler name: ceph-handler
when: dashboard_enabled when: dashboard_enabled
- import_role:
name: ceph-node-exporter
when: dashboard_enabled
- import_role: - import_role:
name: ceph-common name: ceph-common
when: dashboard_enabled when: dashboard_enabled