From 5573f17e76382d62a74303e3422ddca512247779 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 14 Aug 2019 11:04:30 +0200 Subject: [PATCH] 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 --- infrastructure-playbooks/shrink-mon.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) 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 -- 2.39.5