osd: do not use expose_partitions on lvm

expose_partitions is only needed on ceph-disk OSDs so we don't need to
activate this code when running lvm prepared OSDs.

Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/roles/ceph-osd/templates/ceph-osd-run.sh.j2 b/roles/ceph-osd/templates/ceph-osd-run.sh.j2
index bd08f35cb13cabb18bdb514224deb737b1499e50..b549c8f1f5178d1dfdbaf844bcad047d5b500395 100644 (file)
--- a/roles/ceph-osd/templates/ceph-osd-run.sh.j2
+++ b/roles/ceph-osd/templates/ceph-osd-run.sh.j2
@@ -11,6 +11,7 @@ DOCKER_ENV=""
 #############
 # FUNCTIONS #
 #############
+{% if osd_scenario != 'lvm' -%}
 {% if disk_list.get('rc') == 0 -%}
 function expose_partitions () {
 DOCKER_ENV=$(docker run --rm --net=host --name expose_partitions_${1} --privileged=true -v /dev/:/dev/ -v /etc/ceph:/etc/ceph:z -e CLUSTER={{ cluster }} -e OSD_DEVICE=/dev/${1} {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} disk_list)
@@ -52,6 +53,7 @@ function expose_partitions {
   fi
 }
 {% endif -%}
+{% endif -%}
 
 expose_partitions "$1"