]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
ceph-osd: change jinja condition
authorSébastien Han <seb@redhat.com>
Tue, 27 Nov 2018 16:50:44 +0000 (17:50 +0100)
committermergify[bot] <mergify[bot]@users.noreply.github.com>
Mon, 3 Dec 2018 14:11:47 +0000 (14:11 +0000)
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>
roles/ceph-osd/templates/ceph-osd-run.sh.j2

index 9f3f6ac46b326188725df301e92f953354df0a92..787ce1365f623dfebb347a664f0da0ee5bcb7779 100644 (file)
@@ -52,10 +52,11 @@ function expose_partitions {
   fi
 }
 
+{% endif -%}
+
 expose_partitions "$1"
 
 {% endif -%}
-{% endif -%}
 
 
 ########