vstart.sh: less config noise

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

diff --git a/src/vstart.sh b/src/vstart.sh
index d523037188c63982f92c3eaae5b31df63eafda23..91561976a9726883c32eabcce01591c011cbc5cf 100755 (executable)
--- 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