From 7eb42c9e8ec9f28b81eb1f1348c20749c4c8adc2 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 17 Apr 2019 14:02:06 +0200 Subject: [PATCH] update: ensure tasks are executed on an upgraded mon These tasks must be run from a monitor which is upgraded otherwise it might fail. See: https://tracker.ceph.com/issues/39355 Signed-off-by: Guillaume Abrioux --- infrastructure-playbooks/rolling_update.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml index 2ed3516c3..e4d1e2366 100644 --- a/infrastructure-playbooks/rolling_update.yml +++ b/infrastructure-playbooks/rolling_update.yml @@ -236,7 +236,7 @@ - containerized_deployment - name: non container | waiting for the monitor to join the quorum... - command: ceph --cluster "{{ cluster }}" -s --format json + command: ceph --cluster "{{ cluster }}" -m "{{ hostvars[groups[mon_group_name][0]]['_current_monitor_address'] }}" -s --format json register: ceph_health_raw until: - ceph_health_raw.rc == 0 @@ -244,21 +244,19 @@ hostvars[inventory_hostname]['ansible_fqdn'] in (ceph_health_raw.stdout | default('{}') | from_json)["quorum_names"]) retries: "{{ health_mon_check_retries }}" delay: "{{ health_mon_check_delay }}" - delegate_to: "{{ mon_host }}" when: - not containerized_deployment - name: container | waiting for the containerized monitor to join the quorum... command: > - {{ container_binary }} exec ceph-mon-{{ hostvars[mon_host]['ansible_hostname'] }} ceph --cluster "{{ cluster }}" -s --format json + {{ container_binary }} exec ceph-mon-{{ ansible_hostname }} ceph --cluster "{{ cluster }}" -m "{{ hostvars[groups[mon_group_name][0]]['_current_monitor_address'] }}" -s --format json register: ceph_health_raw - until: > + until: - ceph_health_raw.rc == 0 - (hostvars[inventory_hostname]['ansible_hostname'] in (ceph_health_raw.stdout | default('{}') | from_json)["quorum_names"] or hostvars[inventory_hostname]['ansible_fqdn'] in (ceph_health_raw.stdout | default('{}') | from_json)["quorum_names"]) retries: "{{ health_mon_check_retries }}" delay: "{{ health_mon_check_delay }}" - delegate_to: "{{ mon_host }}" when: - containerized_deployment -- 2.39.5