]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
osd: support changing default rule even when osd_crush_location isn't defined
authorGuillaume Abrioux <gabrioux@redhat.com>
Thu, 12 Mar 2020 11:14:01 +0000 (12:14 +0100)
committerGuillaume Abrioux <gabrioux@redhat.com>
Tue, 31 Mar 2020 21:04:03 +0000 (23:04 +0200)
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)

roles/ceph-osd/tasks/crush_rules.yml

index 553d9a9565eb228735c734222a18e3e0bb5f5368..b0d453d4a9ee68cd1c0ece64f30a2b6d2dfc357d 100644 (file)
@@ -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
     - not containerized_deployment | bool
 
@@ -68,5 +67,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