mstart: make some mstart env variables configurable

Signed-off-by: Nizamudeen A <nia@redhat.com>

diff --git a/src/mrun b/src/mrun
index 0536e43fd1bbeb5dfe9b4183c3ad0aca54fa1644..a85221800218b3a577240a354384b7cef4602d87 100755 (executable)
--- a/src/mrun
+++ b/src/mrun
@@ -6,7 +6,7 @@ root=`dirname $0`
 run_name=$1
 command=$2
 CEPH_BIN=""
-CEPH_CONF_PATH="/etc/ceph/"
+CEPH_CONF_PATH=${CEPH_CONF_PATH:-/etc/ceph/}
 
 [ -z "$BUILD_DIR" ] && BUILD_DIR=build
 

diff --git a/src/mstart.sh b/src/mstart.sh
index 4bf3bde4b69c76b990b20695fff29cbbd232eb5f..34b57e1761125ac19ba018cf4e9c4f6d17b99f97 100755 (executable)
--- a/src/mstart.sh
+++ b/src/mstart.sh
@@ -49,9 +49,9 @@ pos=`echo $pos | cut -d: -f1`
 base_port=$((6800+pos*20))
 rgw_port=$((8000+pos*1))
 
-export VSTART_DEST=$RUN_ROOT_PATH/$instance
-export CEPH_PORT=$base_port
-export CEPH_RGW_PORT=$rgw_port
+[ -z "$VSTART_DEST" ] && export VSTART_DEST=$RUN_ROOT_PATH/$instance
+[ -z "$CEPH_PORT" ] && export CEPH_PORT=$base_port
+[ -z "$CEPH_RGW_PORT" ] && export CEPH_RGW_PORT=$rgw_port
 
 mkdir -p $VSTART_DEST
 

diff --git a/src/vstart.sh b/src/vstart.sh
index 51ebcf26cdbacd8f8c1898c345adb85bee04e074..b4daa13e487805e0d82bb556034cd610ef8fbfe4 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -36,8 +36,8 @@ if [ -n "$VSTART_DEST" ]; then
     SRC_PATH=`(cd $SRC_PATH; pwd)`
 
     CEPH_DIR=$SRC_PATH
-    CEPH_BIN=${PWD}/bin
-    CEPH_LIB=${PWD}/lib
+    CEPH_BIN=${CEPH_BIN:-${PWD}/bin}
+    CEPH_LIB=${CEPH_LIB:-${PWD}/lib}
 
     CEPH_CONF_PATH=$VSTART_DEST
     CEPH_DEV_DIR=$VSTART_DEST/dev