From 47cef7a41d1badfed50d559ad8c710f1609a81af Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Fri, 2 Mar 2018 14:53:57 +0100 Subject: [PATCH] mon: fix set crush default rule MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit On releases after jewel the option 'osd_pool_default_crush_replicated_ruleset' does not exist anymore, it's called osd_pool_default_crush_rule. Signed-off-by: Sébastien Han --- roles/ceph-mon/tasks/crush_rules.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/roles/ceph-mon/tasks/crush_rules.yml b/roles/ceph-mon/tasks/crush_rules.yml index 4c07375cc..8e5089530 100644 --- a/roles/ceph-mon/tasks/crush_rules.yml +++ b/roles/ceph-mon/tasks/crush_rules.yml @@ -31,15 +31,20 @@ with_items: "{{ info_ceph_default_crush_rule.results }}" when: not item.get('skipped', false) +- name: set_fact osd_pool_default_crush_rule to osd_pool_default_crush_replicated_ruleset if release < luminous else osd_pool_default_crush_rule + set_fact: + osd_pool_default_crush_rule: "{{ 'osd_pool_default_crush_replicated_ruleset' if ceph_release_num[ceph_release] < ceph_release_num.luminous else 'osd_pool_default_crush_rule' }}" + - name: insert new default crush rule into daemon to prevent restart - command: "{{ docker_exec_cmd }} ceph --cluster {{ cluster }} daemon mon.{{ monitor_name }} config set osd_pool_default_crush_replicated_ruleset {{ info_ceph_default_crush_rule_yaml.rule_id }}" + command: "{{ docker_exec_cmd }} ceph --cluster {{ cluster }} daemon mon.{{ monitor_name }} config set {{ osd_pool_default_crush_rule }} {{ info_ceph_default_crush_rule_yaml.rule_id }}" changed_when: false - when: info_ceph_default_crush_rule_yaml|default('')|length > 0 + when: + - info_ceph_default_crush_rule_yaml|default('')|length > 0 -- name: add new default crush rule to ceph.conf +- name: "add new default crush rule to {{ cluster }}.conf" ini_file: dest: "/etc/ceph/{{ cluster }}.conf" section: "global" - option: "osd pool default crush replicated ruleset" + option: "{{ osd_pool_default_crush_rule }}" value: "{{ info_ceph_default_crush_rule_yaml.rule_id }}" when: info_ceph_default_crush_rule_yaml|default('')|length > 0 -- 2.39.5