From: iliul <liul124@chinaunicom.cn>
Date: Thu, 7 Sep 2017 07:31:17 +0000 (+0000)
Subject: vstart.sh: Remove duplicate global section
X-Git-Tag: v13.0.1~937^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=549c91071536c6402b2ddf78d5b0049fe252d60a;p=ceph-ci.git

vstart.sh: Remove duplicate global section

Signed-off-by: iliul <liul124@chinaunicom.cn>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index ee10520e3d2..c03bf2aae65 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -440,6 +440,7 @@ prepare_conf() {
         filestore fd cache size = 32
         run dir = $CEPH_OUT_DIR
         enable experimental unrecoverable data corrupting features = *
+$extra_conf
 EOF
 	if [ "$lockdep" -eq 1 ] ; then
 		wconf <<EOF
@@ -468,7 +469,7 @@ EOF
         keyring = $keyring_fn
         log file = $CEPH_OUT_DIR/\$name.\$pid.log
         admin socket = $CEPH_ASOK_DIR/\$name.\$pid.asok
-
+$extra_conf
 [client.rgw]
 
 [mds]
@@ -531,8 +532,6 @@ $DAEMONOPTS
 $CMONDEBUG
 $extra_conf
         mon cluster log file = $CEPH_OUT_DIR/cluster.mon.\$id.log
-[global]
-$extra_conf
 EOF
 }