mirror of https://github.com/ceph/ceph-ansible.git
shrink-osd: add missing CEPH_BINARY
We need to add the right binary to do the docker exec. Signed-off-by: Sébastien Han <seb@redhat.com>pull/3367/head
parent
3684d421e4
commit
e5d5dffeb5
|
@ -63,7 +63,7 @@
|
||||||
# post-task for preceding import
|
# post-task for preceding import
|
||||||
- name: set_fact docker_exec_cmd build docker exec command (containerized)
|
- name: set_fact docker_exec_cmd build docker exec command (containerized)
|
||||||
set_fact:
|
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
|
when: containerized_deployment
|
||||||
|
|
||||||
- name: exit playbook, if can not connect to the cluster
|
- name: exit playbook, if can not connect to the cluster
|
||||||
|
@ -91,6 +91,7 @@
|
||||||
environment:
|
environment:
|
||||||
CEPH_VOLUME_DEBUG: 1
|
CEPH_VOLUME_DEBUG: 1
|
||||||
CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"
|
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 }}"
|
with_items: "{{ osd_hosts }}"
|
||||||
delegate_to: "{{ item }}"
|
delegate_to: "{{ item }}"
|
||||||
register: osd_volumes
|
register: osd_volumes
|
||||||
|
@ -135,6 +136,7 @@
|
||||||
environment:
|
environment:
|
||||||
CEPH_VOLUME_DEBUG: 1
|
CEPH_VOLUME_DEBUG: 1
|
||||||
CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"
|
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 }}"
|
delegate_to: "{{ item.host }}"
|
||||||
with_items: "{{ osd_host_volumes_to_kill_non_container }}"
|
with_items: "{{ osd_host_volumes_to_kill_non_container }}"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue