rolling_update: perform pg check when pgs_num > 0

If num_pgs = 0 the check will never return 0.

Signed-off-by: Sébastien Han <seb@redhat.com>
pull/2009/head
Sébastien Han 2017-10-07 00:46:46 +02:00
parent a4dcef73d4
commit 05f26031ea
1 changed files with 18 additions and 2 deletions

View File

@ -147,7 +147,21 @@
when: when:
- mon_host_count | int == 1 - mon_host_count | int == 1
- name: waiting for the monitor to join the quorum... - name: get num_pgs - non container
command: ceph --cluster "{{ cluster }}" -s --format json
register: ceph_pgs
delegate_to: "{{ mon_host }}"
when:
- not containerized_deployment
- name: get num_pgs - container
command: docker exec ceph-mon-{{ hostvars[mon_host]['ansible_hostname'] }} ceph --cluster "{{ cluster }}" -s --format json
register: ceph_pgs
delegate_to: "{{ mon_host }}"
when:
- containerized_deployment
- name: non container | waiting for the monitor to join the quorum...
command: ceph --cluster "{{ cluster }}" -s --format json command: ceph --cluster "{{ cluster }}" -s --format json
register: ceph_health_raw register: ceph_health_raw
until: > until: >
@ -157,8 +171,9 @@
delegate_to: "{{ mon_host }}" delegate_to: "{{ mon_host }}"
when: when:
- not containerized_deployment - not containerized_deployment
- (ceph_pgs.stdout | from_json).pgmap.num_pgs != "0"
- name: waiting for the containerized monitor to join the quorum... - name: container | waiting for the containerized monitor to join the quorum...
command: docker exec ceph-mon-{{ hostvars[mon_host]['ansible_hostname'] }} ceph --cluster "{{ cluster }}" -s --format json command: docker exec ceph-mon-{{ hostvars[mon_host]['ansible_hostname'] }} ceph --cluster "{{ cluster }}" -s --format json
register: ceph_health_raw register: ceph_health_raw
until: > until: >
@ -168,6 +183,7 @@
delegate_to: "{{ mon_host }}" delegate_to: "{{ mon_host }}"
when: when:
- containerized_deployment - containerized_deployment
- (ceph_pgs.stdout | from_json).pgmap.num_pgs != "0"
- name: set osd flags - name: set osd flags
command: ceph osd set {{ item }} --cluster {{ cluster }} command: ceph osd set {{ item }} --cluster {{ cluster }}