From 3a587575d76ecfec050d3d12cd416853baf590af Mon Sep 17 00:00:00 2001 From: Fabien Brachere Date: Mon, 16 Oct 2017 15:04:23 +0200 Subject: [PATCH] Add ability to enable ceph mgr modules. --- group_vars/mgrs.yml.sample | 6 ++++++ roles/ceph-mgr/defaults/main.yml | 6 ++++++ roles/ceph-mgr/tasks/main.yml | 17 ++++++++++++++++- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/group_vars/mgrs.yml.sample b/group_vars/mgrs.yml.sample index a7f10dbef..d26749e1f 100644 --- a/group_vars/mgrs.yml.sample +++ b/group_vars/mgrs.yml.sample @@ -7,6 +7,12 @@ # file as a good configuration file when no variable in it. dummy: +########### +# MODULES # +########### +# Ceph mgr modules to enable, current modules available are: status,dashboard,localpool,restful,zabbix,prometheus,influx +#ceph_mgr_modules: [status] + ########## # DOCKER # ########## diff --git a/roles/ceph-mgr/defaults/main.yml b/roles/ceph-mgr/defaults/main.yml index 57300559b..e0b0c98a9 100644 --- a/roles/ceph-mgr/defaults/main.yml +++ b/roles/ceph-mgr/defaults/main.yml @@ -1,4 +1,10 @@ --- +########### +# MODULES # +########### +# Ceph mgr modules to enable, current modules available are: status,dashboard,localpool,restful,zabbix,prometheus,influx +ceph_mgr_modules: [status] + ########## # DOCKER # ########## diff --git a/roles/ceph-mgr/tasks/main.yml b/roles/ceph-mgr/tasks/main.yml index e3a0bb244..fabef8e08 100644 --- a/roles/ceph-mgr/tasks/main.yml +++ b/roles/ceph-mgr/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: set_fact docker_exec_cmd set_fact: - docker_exec_cmd: "docker exec ceph-mgr-{{ ansible_hostname }}" + docker_exec_cmd_mgr: "docker exec ceph-mon-{{ hostvars[groups[mon_group_name][0]]['ansible_hostname'] }}" when: - containerized_deployment @@ -12,3 +12,18 @@ - name: include docker/main.yml include: docker/main.yml when: containerized_deployment + +- name: get enabled modules from ceph-mgr + command: "{{ docker_exec_cmd_mgr | default('') }} ceph --cluster {{ cluster }} --format json mgr module ls" + register: enabled_ceph_mgr_modules + delegate_to: "{{ groups[mon_group_name][0] }}" + +- name: disable ceph mgr enabled modules + command: "{{ docker_exec_cmd_mgr | default('') }} ceph --cluster {{ cluster }} mgr module disable {{ item }}" + with_items: "{{ enabled_ceph_mgr_modules.stdout | from_json }}" + delegate_to: "{{ groups[mon_group_name][0] }}" + +- name: add modules to ceph-mgr + command: "{{ docker_exec_cmd_mgr | default('') }} ceph --cluster {{ cluster }} mgr module enable {{ item }}" + with_items: "{{ ceph_mgr_modules }}" + delegate_to: "{{ groups[mon_group_name][0] }}"