From: Sébastien Han Date: Mon, 20 Aug 2018 14:03:59 +0000 (+0200) Subject: osd: fix ceph_release X-Git-Tag: v3.1.0rc19~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aeff1dbfd8b0fbd35668f520b4cca739165b9815;p=ceph-ansible.git osd: fix ceph_release We need ceph_release in the condition, not ceph_stable_release Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1619255 Signed-off-by: Sébastien Han (cherry picked from commit 8c70a5b1975c31992cdfa0a46a04bd9afbc1a806) --- diff --git a/roles/ceph-osd/tasks/openstack_config.yml b/roles/ceph-osd/tasks/openstack_config.yml index 512fc5109..a74cdb39e 100644 --- a/roles/ceph-osd/tasks/openstack_config.yml +++ b/roles/ceph-osd/tasks/openstack_config.yml @@ -1,7 +1,7 @@ --- - name: wait for all osd to be up shell: > - test "$({{ hostvars[groups[mon_group_name][0]]['docker_exec_cmd'] | default('') }} ceph --cluster {{ cluster }} -s -f json | python -c 'import sys, json; print(json.load(sys.stdin)["osdmap"]["osdmap"]["num_osds"])')" = + test "$({{ hostvars[groups[mon_group_name][0]]['docker_exec_cmd'] | default('') }} ceph --cluster {{ cluster }} -s -f json | python -c 'import sys, json; print(json.load(sys.stdin)["osdmap"]["osdmap"]["num_osds"])')" = "$({{ hostvars[groups[mon_group_name][0]]['docker_exec_cmd'] | default('') }} ceph --cluster {{ cluster }} -s -f json | python -c 'import sys, json; print(json.load(sys.stdin)["osdmap"]["osdmap"]["num_up_osds"])')" register: wait_for_all_osds_up retries: 30 @@ -22,15 +22,15 @@ set_fact: rule_name: "replicated_ruleset" when: - - ceph_release_num[ceph_stable_release] < ceph_release_num['luminous'] + - ceph_release_num[ceph_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) + - ceph_release_num[ceph_release] >= ceph_release_num['luminous'] + or (ceph_release_num[ceph_release] < ceph_release_num['luminous'] and rolling_update) - name: create openstack pool(s) command: >