From: Dardo D Kleiner Date: Wed, 15 Aug 2018 12:50:19 +0000 (-0400) Subject: mgr: improve/fix disabled modules check X-Git-Tag: v3.2.0beta2~42 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f6519e4003404e10ae1f5e86298cffd4405591da;p=ceph-ansible.git mgr: improve/fix disabled modules check Follow up on 36942af6983d60666f3f8a1a06b352a440a6c0da "disabled_modules" is always a list, it's the items in the list that can be dicts in mimic. Many ways to fix this, here's one. Signed-off-by: Dardo D Kleiner --- diff --git a/roles/ceph-mgr/tasks/main.yml b/roles/ceph-mgr/tasks/main.yml index e2b480c64..a2eda822d 100644 --- a/roles/ceph-mgr/tasks/main.yml +++ b/roles/ceph-mgr/tasks/main.yml @@ -31,7 +31,7 @@ - name: set _disabled_ceph_mgr_modules fact set_fact: - _disabled_ceph_mgr_modules: "{% if _ceph_mgr_modules | type_debug == 'list' %}[]{% elif _ceph_mgr_modules.disabled_modules | type_debug == 'dict' %}{{ _ceph_mgr_modules['disabled_modules'] }}{% else %}{{ _ceph_mgr_modules['disabled_modules'] | map(attribute='name') | list }}{% endif %}" + _disabled_ceph_mgr_modules: "{% if _ceph_mgr_modules.disabled_modules | length == 0 %}[]{% elif _ceph_mgr_modules.disabled_modules[0] | type_debug != 'dict' %}{{ _ceph_mgr_modules['disabled_modules'] }}{% else %}{{ _ceph_mgr_modules['disabled_modules'] | map(attribute='name') | list }}{% endif %}" when: - ceph_release_num[ceph_release] >= ceph_release_num['luminous']