From 053709da9730a826976f56a9c2c5e08e47722624 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 25 Jul 2018 18:12:06 +0200 Subject: [PATCH] ceph-osds: backward compatibility with jewel for osp pools creation If we want to be backward compatible with release prior to luminous, we have to set the rule name accordingly to default values used in jewel. Signed-off-by: Guillaume Abrioux --- roles/ceph-osd/tasks/openstack_config.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/roles/ceph-osd/tasks/openstack_config.yml b/roles/ceph-osd/tasks/openstack_config.yml index 1ff42f169..512fc5109 100644 --- a/roles/ceph-osd/tasks/openstack_config.yml +++ b/roles/ceph-osd/tasks/openstack_config.yml @@ -18,13 +18,27 @@ delegate_to: "{{ groups[mon_group_name][0] }}" failed_when: false +- name: set_fact rule_name before luminous + set_fact: + rule_name: "replicated_ruleset" + when: + - ceph_release_num[ceph_stable_release] < ceph_release_num['luminous'] + - not rolling_update + +- name: set_fact rule_name from luminous + set_fact: + rule_name: "replicated_rule" + when: + - ceph_release_num[ceph_stable_release] >= ceph_release_num['luminous'] + or (ceph_release_num[ceph_stable_release] < ceph_release_num['luminous'] and rolling_update) + - name: create openstack pool(s) command: > {{ hostvars[groups[mon_group_name][0]]['docker_exec_cmd'] | default('') }} ceph --cluster {{ cluster }} osd pool create {{ item.0.name }} {{ item.0.pg_num }} {{ item.0.pgp_num | default(item.0.pg_num) }} - {{ 'replicated_rule' if item.0.rule_name | default('replicated_rule') == '' else item.0.rule_name | default('replicated_rule') }} + {{ rule_name if item.0.rule_name | default(rule_name) == '' else item.0.rule_name | default(rule_name) }} {{ 1 if item.0.type|default(1) == 'replicated' else 3 if item.0.type|default(1) == 'erasure' else item.0.type|default(1) }} {%- if (item.0.type | default("1") == '3' or item.0.type | default("1") == 'erasure') and item.0.erasure_profile != '' %} {{ item.0.erasure_profile }} -- 2.39.5