]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
shrink-osd: add missing CEPH_BINARY
authorSébastien Han <seb@redhat.com>
Thu, 22 Nov 2018 16:32:25 +0000 (17:32 +0100)
committermergify[bot] <mergify[bot]@users.noreply.github.com>
Tue, 27 Nov 2018 16:47:40 +0000 (16:47 +0000)
We need to add the right binary to do the docker exec.

Signed-off-by: Sébastien Han <seb@redhat.com>
infrastructure-playbooks/shrink-osd.yml

index 1d31525bf383798a49de72172ed24d0ae62fa475..6bead567e8e397999919be499c9624556cf377b4 100644 (file)
@@ -63,7 +63,7 @@
     # post-task for preceding import
     - name: set_fact docker_exec_cmd build docker exec command (containerized)
       set_fact:
-        docker_exec_cmd: "docker exec ceph-mon-{{ hostvars[groups[mon_group_name][0]]['ansible_hostname'] }}"
+        docker_exec_cmd: "{{ container_binary }} exec ceph-mon-{{ hostvars[groups[mon_group_name][0]]['ansible_hostname'] }}"
       when: containerized_deployment
 
     - name: exit playbook, if can not connect to the cluster
@@ -91,6 +91,7 @@
       environment:
         CEPH_VOLUME_DEBUG: 1
         CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"
+        CEPH_CONTAINER_BINARY: "{{ container_binary }}"
       with_items: "{{ osd_hosts }}"
       delegate_to: "{{ item }}"
       register: osd_volumes
       environment:
         CEPH_VOLUME_DEBUG: 1
         CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"
+        CEPH_CONTAINER_BINARY: "{{ container_binary }}"
       delegate_to: "{{ item.host }}"
       with_items: "{{ osd_host_volumes_to_kill_non_container }}"