From bef522627e1e9827b86710c7a54f35a0cd596fbb Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Tue, 27 Nov 2018 17:50:44 +0100 Subject: [PATCH] ceph-osd: change jinja condition MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- roles/ceph-osd/templates/ceph-osd-run.sh.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -%} ######## -- 2.39.5