From: John Spray <john.spray@redhat.com>
Date: Mon, 3 Aug 2015 15:07:55 +0000 (+0100)
Subject: vstart: enable more path customization
X-Git-Tag: v9.1.0~394^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dac84a7aeb132c318a97965be6ca7b993abb3c42;p=ceph.git

vstart: enable more path customization

...for working with out-of-tree builds.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index c039eb733649..fb63749edc13 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -16,7 +16,9 @@ if [ -z "${CEPH_VSTART_WRAPPER}" ]; then
     PATH=$(pwd):$PATH
 fi
 
-export PYTHONPATH=./pybind
+[ -z "$PYBIND" ] && PYBIND=./pybind
+
+export PYTHONPATH=$PYBIND
 export LD_LIBRARY_PATH=$CEPH_LIB
 export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
 
@@ -315,11 +317,12 @@ echo "ip $IP"
 echo "port $PORT"
 
 
+[ -z $CEPH_ADM ] && CEPH_ADM=$CEPH_BIN/ceph
 
 if [ "$cephx" -eq 1 ]; then
-    CEPH_ADM="$CEPH_BIN/ceph -c $conf_fn -k $keyring_fn"
+    CEPH_ADM="$CEPH_ADM -c $conf_fn -k $keyring_fn"
 else
-    CEPH_ADM="$CEPH_BIN/ceph -c $conf_fn"
+    CEPH_ADM="$CEPH_ADM -c $conf_fn"
 fi
 
 MONS=""
@@ -422,6 +425,7 @@ $extra_conf
         mon osd allow primary affinity = true
         mon reweight min pgs per osd = 4
         mon osd prime pg temp = true
+        crushtool = $CEPH_BIN/crushtool
 $DAEMONOPTS
 $CMONDEBUG
 $extra_conf