From 2f8356bf12e78238e80da0a23f578c3883ec85c4 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Fri, 15 Sep 2017 12:42:48 +0800
Subject: [PATCH] vstart.sh: simplify the objectstore related logic

also avoid overriding --memstore specified by command line with
the default "bluestore"

Reported-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 src/vstart.sh | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/vstart.sh b/src/vstart.sh
index b4f81a061f887..83312230c1022 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -105,11 +105,10 @@ hitset=""
 overwrite_conf=1
 cephx=1 #turn cephx on by default
 cache=""
-memstore=0
 if [ `uname` = FreeBSD ]; then
-    bluestore=0
+    objectstore="filestore"
 else
-    bluestore=1
+    objectstore="bluestore"
 fi
 rgw_frontend="civetweb"
 rgw_compression=""
@@ -291,13 +290,13 @@ case $1 in
 	    overwrite_conf=0
 	    ;;
     --memstore )
-	    memstore=1
+	    objectstore="memstore"
 	    ;;
     -b | --bluestore )
-	    bluestore=1
+	    objectstore="bluestore"
 	    ;;
     -f | --filestore )
-	    bluestore=0
+	    objectstore="filestore"
 	    ;;
     --hitset )
 	    hitset="$hitset $2 $3"
@@ -521,7 +520,7 @@ $DAEMONOPTS
         bluestore block wal size = 1048576000
         bluestore block wal create = true
 $COSDDEBUG
-$COSDMEMSTORE
+        osd objectstore = $objectstore
 $COSDSHORT
 $extra_conf
 [mon]
@@ -806,15 +805,6 @@ if [ -n "$MON_ADDR" ]; then
 	CMDS_ARGS=" -m "$MON_ADDR
 fi
 
-if [ "$memstore" -eq 1 ]; then
-    COSDMEMSTORE='
-	osd objectstore = memstore'
-fi
-if [ "$bluestore" -eq 1 ]; then
-    COSDMEMSTORE='
-	osd objectstore = bluestore'
-fi
-
 if [ -z "$CEPH_PORT" ]; then
     CEPH_PORT=6789
     [ -e ".ceph_port" ] && CEPH_PORT=`cat .ceph_port`
-- 
2.39.5