From ece9e9812ea4a9d0c0faf485d780401147cc16c4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Fri, 28 Sep 2018 17:19:46 +0200 Subject: [PATCH] osd: do not use expose_partitions on lvm MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- roles/ceph-osd/templates/ceph-osd-run.sh.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/ceph-osd/templates/ceph-osd-run.sh.j2 b/roles/ceph-osd/templates/ceph-osd-run.sh.j2 index bd08f35cb..b549c8f1f 100644 --- 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" -- 2.39.5