From: Sage Weil <sage@redhat.com>
Date: Mon, 4 Dec 2017 22:37:14 +0000 (-0600)
Subject: vstart.sh: less config noise
X-Git-Tag: v13.0.2~78^2~120
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8bd1f8d338ffacdd56f23d1f18d5ec6c1a85884a;p=ceph-ci.git

vstart.sh: less config noise

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index d523037188c..91561976a97 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -447,13 +447,7 @@ EOF
         lockdep = true
 EOF
 	fi
-	if [ "$cephx" -eq 1 ] ; then
-		wconf <<EOF
-        auth cluster required = cephx
-        auth service required = cephx
-        auth client required = cephx
-EOF
-	else
+	if [ "$cephx" -ne 1 ] ; then
 		wconf <<EOF
 	auth cluster required = none
 	auth service required = none
@@ -533,7 +527,6 @@ $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
         mon allow pool delete = true
 $DAEMONOPTS
 $CMONDEBUG