ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mon: fix set crush default rule 

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 <seb@redhat.com>
pull/2436/head
Sébastien Han 2018-03-02 14:53:57 +01:00 committed by Guillaume Abrioux
parent 3261ab23b8
commit 47cef7a41d
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
roles/ceph-mon/tasks/crush_rules.yml
View File

@ -31,15 +31,20 @@
with_items: "{{ info_ceph_default_crush_rule.results }}" with_items: "{{ info_ceph_default_crush_rule.results }}"
when: not item.get('skipped', false) when: not item.get('skipped', false)
- name: insert new default crush rule into daemon to prevent restart - name: set_fact osd_pool_default_crush_rule to osd_pool_default_crush_replicated_ruleset if release < luminous else osd_pool_default_crush_rule
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 }}" set_fact:
changed_when: false 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' }}"
when: info_ceph_default_crush_rule_yaml|default('')|length > 0
- name: add new default crush rule to ceph.conf - 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_rule }} {{ info_ceph_default_crush_rule_yaml.rule_id }}"
changed_when: false
when:
- info_ceph_default_crush_rule_yaml|default('')|length > 0
- name: "add new default crush rule to {{ cluster }}.conf"
ini_file: ini_file:
dest: "/etc/ceph/{{ cluster }}.conf" dest: "/etc/ceph/{{ cluster }}.conf"
section: "global" section: "global"
option: "osd pool default crush replicated ruleset" option: "{{ osd_pool_default_crush_rule }}"
value: "{{ info_ceph_default_crush_rule_yaml.rule_id }}" value: "{{ info_ceph_default_crush_rule_yaml.rule_id }}"
when: info_ceph_default_crush_rule_yaml|default('')|length > 0 when: info_ceph_default_crush_rule_yaml|default('')|length > 0