From ec2d1f502da90baa4d526207564ec8d1a92bf5db Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Thu, 29 Nov 2018 00:10:29 +0100 Subject: [PATCH] osd: re-introduce disk_list check MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This commit https://github.com/ceph/ceph-ansible/commit/4cc1506303739f13bb7a6e1022646ef90e004c90#diff-51bbe3572e46e3b219ad726da44b64ebL13 accidentally removed this check. This is a must have for ceph-disk based containerized OSDs. Signed-off-by: Sébastien Han (cherry picked from commit 9b5a93e3a58bff07ce965ce2d6dabd4060537b5c) --- roles/ceph-osd/tasks/start_osds.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/roles/ceph-osd/tasks/start_osds.yml b/roles/ceph-osd/tasks/start_osds.yml index 393fe2043..84b97c6ad 100644 --- a/roles/ceph-osd/tasks/start_osds.yml +++ b/roles/ceph-osd/tasks/start_osds.yml @@ -11,6 +11,14 @@ when: - ceph_docker_on_openstack + - name: test if the container image has the disk_list function + command: "{{ container_binary }} run --rm --entrypoint=stat {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} 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 template: -- 2.39.5