Merge pull request #2075 from ceph/fix_3a58757

[skip ci] mgr: fix broken task on jewel
pull/2060/merge
Sébastien Han 2017-10-18 15:19:41 +02:00 committed by GitHub
commit f047ad15f9
1 changed files with 5 additions and 1 deletions

View File

@ -20,8 +20,12 @@
- 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 }}"
# When ceph release is jewel, ceph-mgr role is skipped. It means, the enabled_ceph_mgr_modules doesn't contain 'stdout' attribute.
# Therefore, we need to get a default value which can be used up by from_json filter.
with_items: "{{ enabled_ceph_mgr_modules.get('stdout', '{}') | from_json }}"
delegate_to: "{{ groups[mon_group_name][0] }}"
when:
- not enabled_ceph_mgr_modules.get('skipped')
- name: add modules to ceph-mgr
command: "{{ docker_exec_cmd_mgr | default('') }} ceph --cluster {{ cluster }} mgr module enable {{ item }}"