From 1bb5aadbca80eb46d5393bb1ad68af3da025e157 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 1 Nov 2013 16:45:01 -0700 Subject: [PATCH] upstart: fix ceph-crush-location default Behave if it is not specified on ceph.conf. (init-ceph also falls back to the default.) Fixes: #6698 Signed-off-by: Sage Weil --- src/upstart/ceph-osd.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/upstart/ceph-osd.conf b/src/upstart/ceph-osd.conf index a2f659460da7..91ac22c5188c 100644 --- a/src/upstart/ceph-osd.conf +++ b/src/upstart/ceph-osd.conf @@ -19,6 +19,9 @@ pre-start script if [ "${update:-1}" = "1" -o "{$update:-1}" = "true" ]; then # update location in crush hook="$(ceph-conf --cluster=${cluster:-ceph} --name=osd.$id --lookup osd_crush_location_hook || :)" + if [ -z "$hook" ]; then + hook="/usr/bin/ceph-crush-location" + fi location="$($hook --cluster ${cluster:-ceph} --id $id --type osd)" weight="$(ceph-conf --cluster=${cluster:-ceph} --name=osd.$id --lookup osd_crush_initial_weight || :)" defaultweight=`df /var/lib/ceph/osd/${cluster:-ceph}-$id/ | tail -1 | awk '{ d= $2/1073741824 ; r = sprintf("%.2f", d); print r }'` -- 2.47.3