From: Guillaume Abrioux Date: Thu, 12 Mar 2020 11:14:01 +0000 (+0100) Subject: osd: support changing default rule even when osd_crush_location isn't defined X-Git-Tag: v4.0.18~8 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=87e1f0cc6c790e14893bfc18d9c37daad7126f38;p=ceph-ansible.git osd: support changing default rule even when osd_crush_location isn't defined Creating crush rules even with no crush hierarchy configuration is a valid scenario so we shouldn't be bound to the first task result (which configure crush hierarchy) to be able to add new crush rules. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1816989 Signed-off-by: Guillaume Abrioux (cherry picked from commit 5b0476385ccb00a9edb9092a183c18e2637afd5d) --- diff --git a/roles/ceph-osd/tasks/crush_rules.yml b/roles/ceph-osd/tasks/crush_rules.yml index 9a01063af..bfc8cdb4f 100644 --- a/roles/ceph-osd/tasks/crush_rules.yml +++ b/roles/ceph-osd/tasks/crush_rules.yml @@ -43,7 +43,6 @@ with_items: "{{ groups[mon_group_name] }}" run_once: true when: - - not config_crush_hierarchy.get('skipped', false) - info_ceph_default_crush_rule_yaml | default('') | length > 0 - name: "add new default crush rule to {{ cluster }}.conf" @@ -56,5 +55,4 @@ with_items: "{{ groups[mon_group_name] }}" run_once: true when: - - not config_crush_hierarchy.get('skipped', false) - info_ceph_default_crush_rule_yaml | default('') | length > 0