From: Rishabh Dave Date: Thu, 25 Jul 2019 11:32:32 +0000 (+0530) Subject: infra-playbooks: rewite a condition for better readability X-Git-Tag: v4.0.0rc14~47 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8ca88b41cce6ff14fbb7e785c0eaca71e26be7a9;p=ceph-ansible.git infra-playbooks: rewite a condition for better readability Use facility built-in in Ansible to check whether a command was executed successfully rather looking at its return value. Signed-off-by: Rishabh Dave (cherry picked from commit 5aecdd3ba6e67019eda7adcfa6bb5f2a3cce5081) --- diff --git a/infrastructure-playbooks/shrink-mgr.yml b/infrastructure-playbooks/shrink-mgr.yml index 4457c651e..4063b6fde 100644 --- a/infrastructure-playbooks/shrink-mgr.yml +++ b/infrastructure-playbooks/shrink-mgr.yml @@ -43,8 +43,7 @@ - name: exit playbook, if can not connect to the cluster command: "{{ container_exec_cmd | default('') }} timeout 5 ceph --cluster {{ cluster }} health" register: ceph_health - until: ceph_health.rc - failed_when: ceph_health.rc != 0 + until: ceph_health is succeeded delegate_to: "{{ groups[mon_group_name][0] }}" retries: 5 delay: 2 diff --git a/infrastructure-playbooks/shrink-rbdmirror.yml b/infrastructure-playbooks/shrink-rbdmirror.yml index 85f893d9f..ba0a18be2 100644 --- a/infrastructure-playbooks/shrink-rbdmirror.yml +++ b/infrastructure-playbooks/shrink-rbdmirror.yml @@ -68,8 +68,7 @@ - name: exit playbook, if can not connect to the cluster command: "{{ container_exec_cmd | default('') }} timeout 5 ceph --cluster {{ cluster }} -s -f json" register: ceph_health - until: ceph_health.rc - failed_when: ceph_health.rc != 0 + until: ceph_health is succeeded delegate_to: "{{ groups[mon_group_name][0] }}" retries: 5 delay: 2