]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
osd: re-introduce disk_list check
authorSébastien Han <seb@redhat.com>
Wed, 28 Nov 2018 23:10:29 +0000 (00:10 +0100)
committerSébastien Han <seb@redhat.com>
Mon, 3 Dec 2018 15:01:57 +0000 (16:01 +0100)
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 <seb@redhat.com>
(cherry picked from commit 9b5a93e3a58bff07ce965ce2d6dabd4060537b5c)

roles/ceph-osd/tasks/start_osds.yml

index 393fe2043da0cb37bba4c32ebabc148439651958..84b97c6ad18ac8c5fa67893483040bd6ace205c7 100644 (file)
     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: