mirror of https://github.com/ceph/ceph-ansible.git
osd: backward compatibility with old disk_list.sh location
Since all files in container image have moved to `/opt/ceph-container`
this check must look for new AND the old path so it's backward
compatible. Otherwise it could end up by templating an inconsistent
`ceph-osd-run.sh`.
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 987bdac963
)
pull/3777/head
parent
69cda84a21
commit
64bee9cb86
|
@ -10,11 +10,21 @@
|
|||
when:
|
||||
- ceph_docker_on_openstack
|
||||
|
||||
- name: test if the container image has directory {{ container_bin_path }}
|
||||
command: "docker run --rm --net=host --entrypoint=test {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} -d {{ container_bin_path }}"
|
||||
changed_when: false
|
||||
failed_when: false
|
||||
register: test_container_bin_path
|
||||
when:
|
||||
- osd_scenario != 'lvm'
|
||||
|
||||
- name: test if the container image has the disk_list function
|
||||
command: docker run --rm --entrypoint=stat {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} disk_list.sh
|
||||
command: "docker run --rm --net=host --entrypoint=stat {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} {{ container_bin_path + '/disk_list.sh' if test_container_bin_path.rc == 0 else 'disk_list.sh' }}"
|
||||
changed_when: false
|
||||
failed_when: false
|
||||
register: disk_list
|
||||
when:
|
||||
- osd_scenario != 'lvm'
|
||||
|
||||
- name: generate ceph osd docker run script
|
||||
become: true
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
---
|
||||
container_bin_path: /opt/ceph-container/bin
|
Loading…
Reference in New Issue