From: Sage Weil <sage@inktank.com>
Date: Mon, 28 Oct 2013 22:56:36 +0000 (-0700)
Subject: upstart: fail osd start if crush update fails
X-Git-Tag: v0.72-rc1~8^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F772%2Fhead;p=ceph.git

upstart: fail osd start if crush update fails

If the update for the CRUSH position fails for some reason, do not
start the OSD.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/upstart/ceph-osd.conf b/src/upstart/ceph-osd.conf
index c0bf4d68c1cb..ab6af5835e0d 100644
--- a/src/upstart/ceph-osd.conf
+++ b/src/upstart/ceph-osd.conf
@@ -32,8 +32,7 @@ pre-start script
 	    "${weight:-${defaultweight:-1}}" \
 	    root=default \
 	    host="$(hostname -s)" \
-	    $location \
-	    || :
+	    $location
     fi
 
     journal="/var/lib/ceph/osd/${cluster:-ceph}-$id/journal"