switch_to_containers: use ceph binary from container

use the ceph binary from the container instead of the host.
If the ceph CLI version isn't compatible between host and container
image, it can cause the CLI to hang.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/3594/head
Guillaume Abrioux 2019-02-11 11:20:30 +01:00 committed by Sébastien Han
parent 8c8ec63633
commit 4064035a54
1 changed files with 2 additions and 5 deletions

View File

@ -129,16 +129,13 @@
name: ceph-mon name: ceph-mon
post_tasks: post_tasks:
# We don't do a container test by running 'docker exec ...' since not all the monitors have switched to containers yet. - name: waiting for the monitor to join the quorum...
# Thus, we continue to use the 'ceph' binary from the host, there is no issue with that. command: "{{ docker_exec_cmd }} ceph --cluster {{ cluster }} -s --format json"
- name: non container | waiting for the monitor to join the quorum...
command: ceph --cluster "{{ cluster }}" -s --format json
register: ceph_health_raw register: ceph_health_raw
until: > until: >
hostvars[mon_host]['ansible_hostname'] in (ceph_health_raw.stdout | from_json)["quorum_names"] hostvars[mon_host]['ansible_hostname'] in (ceph_health_raw.stdout | from_json)["quorum_names"]
retries: "{{ health_mon_check_retries }}" retries: "{{ health_mon_check_retries }}"
delay: "{{ health_mon_check_delay }}" delay: "{{ health_mon_check_delay }}"
delegate_to: "{{ mon_host }}"
- name: switching from non-containerized to containerized ceph mgr - name: switching from non-containerized to containerized ceph mgr