From: Dimitri Savineau <dsavinea@redhat.com>
Date: Mon, 9 Aug 2021 19:41:40 +0000 (-0400)
Subject: switch2container: fix mon quorum check
X-Git-Tag: v4.0.62.2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=998dda7fdf5308679614d0f248778604b8a8b7e3;p=ceph-ansible.git

switch2container: fix mon quorum check

This was reverted by 7ddbe74

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1990733

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 712a9c44033a9224cdeec5467a9d50ffb78e9d1b)
---

diff --git a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
index 406f96b57..5d4614505 100644
--- a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
+++ b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
@@ -143,7 +143,7 @@
       command: "{{ container_binary }} run --rm  -v /etc/ceph:/etc/ceph:z --entrypoint=ceph {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} --cluster {{ cluster }} quorum_status --format json"
       register: ceph_health_raw
       changed_when: false
-      until: hostvars[mon_host]['ansible_facts']['hostname'] in (ceph_health_raw.stdout | from_json)["quorum_names"]
+      until: ansible_facts['hostname'] in (ceph_health_raw.stdout | trim | from_json)["quorum_names"]
       retries: "{{ health_mon_check_retries }}"
       delay: "{{ health_mon_check_delay }}"