From: Sébastien Han <seb@redhat.com>
Date: Tue, 27 Nov 2018 16:50:44 +0000 (+0100)
Subject: ceph-osd: change jinja condition
X-Git-Tag: v4.0.0beta1~135
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=bef522627e1e9827b86710c7a54f35a0cd596fbb;p=ceph-ansible.git

ceph-osd: change jinja condition

If an existing cluster runs this config, and has ceph-disk OSD, the
`expose_partitions` won't be expected by jinja since it's inside the
'old' if. We need it as part of the osd_scenario != 'lvm' condition.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1640273
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 9f3f6ac46..787ce1365 100644
--- a/roles/ceph-osd/templates/ceph-osd-run.sh.j2
+++ b/roles/ceph-osd/templates/ceph-osd-run.sh.j2
@@ -52,10 +52,11 @@ function expose_partitions {
   fi
 }
 
+{% endif -%}
+
 expose_partitions "$1"
 
 {% endif -%}
-{% endif -%}
 
 
 ########