vstart.sh: Alternative fix for vstart.sh -n

The previous fix (0f7c516f3e) breaks osd startup with -k.  This one
from dmick just tells the ceph-mon which keyring to use through the
command line rather than moving the keyring path to the [global]
section of the config file.

Signed-off-by: Sam Lang <sam.lang@inktank.com>

diff --git a/src/vstart.sh b/src/vstart.sh
index 43cade6ba1ce53d27f7d98d03a605388ec6a7c60..7c3f92d996d817c4ad9203147a430aaec77ae6c7 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -280,9 +280,9 @@ EOF
         auth supported = cephx
 EOF
                        cat <<EOF >> $conf
-        keyring = $keyring_fn
 
 [client]
+        keyring = $keyring_fn
 
 [mds]
 $DAEMONOPTS
@@ -355,7 +355,7 @@ EOF
                    echo $cmd
                    $cmd
                    cmd="$CEPH_BIN/ceph-mon --mkfs -c $conf -i $f --monmap=$monmap_fn"
-                   [ "$cephx" -eq 1 ] && cmd="$cmd --keyring=$keyring_fn"
+                   cmd="$cmd --keyring=$keyring_fn"
                    echo $cmd
                    $cmd
                done