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 <gabrioux@redhat.com>
(cherry picked from commit 5b0476385ccb00a9edb9092a183c18e2637afd5d)

diff --git a/roles/ceph-osd/tasks/crush_rules.yml b/roles/ceph-osd/tasks/crush_rules.yml
index 37ff7b7f0e39f2eaca1a6d420532b8bce611c6fb..4f343da00752dbcd729140d2a5a7d4392c797db1 100644 (file)
--- 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