From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Wed, 14 Aug 2019 09:04:30 +0000 (+0200)
Subject: shrink-mon: refact 'verify the monitor is out of the cluster' task
X-Git-Tag: v4.0.0rc14~27
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=236020fb2bb770175d0ca1da45fdd9e9a8b754d8;p=ceph-ansible.git

shrink-mon: refact 'verify the monitor is out of the cluster' task

use `from_json` filter instead of a `| python` so we can get rid of the
`shell` module usage here.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 5573f17e76382d62a74303e3422ddca512247779)
---

diff --git a/infrastructure-playbooks/shrink-mon.yml b/infrastructure-playbooks/shrink-mon.yml
index c5759a280..1acc5a918 100644
--- a/infrastructure-playbooks/shrink-mon.yml
+++ b/infrastructure-playbooks/shrink-mon.yml
@@ -110,17 +110,12 @@
       delegate_to: "{{ mon_host }}"
 
   post_tasks:
-    # NOTE (leseb): sorry for the 'sleep' command
-    # but it will take a couple of seconds for other monitors
-    # to notice that one member has left.
-    # 'sleep 5' is not that bad and should be sufficient
     - name: verify the monitor is out of the cluster
-      shell: |
-        {{ container_exec_cmd }} ceph --cluster {{ cluster }} -s -f json | {{ discovered_interpreter_python }} -c 'import sys, json; print(json.load(sys.stdin)["quorum_names"])'
+      command: "{{ container_exec_cmd }} ceph --cluster {{ cluster }} -s -f json"
       delegate_to: "{{ mon_host }}"
       failed_when: false
       register: result
-      until: mon_to_kill_hostname not in result.stdout
+      until: mon_to_kill_hostname not in (result.stdout | from_json)['quorum_names']
       retries: 2
       delay: 10