From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Thu, 21 Feb 2019 14:35:55 +0000 (+0100)
Subject: vstart: make beast as the default frontend for rgw
X-Git-Tag: v14.1.0~13^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b9a13aac15f69264eb2982c5e6b7bcc6ad2008f7;p=ceph-ci.git

vstart: make beast as the default frontend for rgw

mstart also features an overrideable $RGW_FRONTEND which defaults to beast

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
---

diff --git a/src/mrgw.sh b/src/mrgw.sh
index 0525f19addc..7579f663bee 100755
--- a/src/mrgw.sh
+++ b/src/mrgw.sh
@@ -2,6 +2,7 @@
 
 set -e
 
+rgw_frontend=${RGW_FRONTEND:-"beast"}
 script_root=`dirname $0`
 script_root=`(cd $script_root;pwd)`
 if [ -e CMakeCache.txt ]; then
@@ -27,4 +28,4 @@ logfile=$run_root/out/radosgw.${port}.log
 
 $vstart_path/mstop.sh $name radosgw $port
 
-$vstart_path/mrun $name radosgw --rgw-frontends="civetweb port=$port" -n client.rgw --pid-file=$pidfile --admin-socket=$asokfile "$@" --log-file=$logfile
+$vstart_path/mrun $name radosgw --rgw-frontends="$rgw_frontend port=$port" -n client.rgw --pid-file=$pidfile --admin-socket=$asokfile "$@" --log-file=$logfile
diff --git a/src/vstart.sh b/src/vstart.sh
index 8e9914dafc6..02977b5e360 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -128,7 +128,7 @@ if [ `uname` = FreeBSD ]; then
 else
     objectstore="bluestore"
 fi
-rgw_frontend="civetweb"
+rgw_frontend="beast"
 rgw_compression=""
 lockdep=${LOCKDEP:-1}
 spdk_enabled=0 #disable SPDK by default