Move keyring option to global section

Using vstart.sh -n uses ceph-authtool to generate the keyring file
in ./keyring.  The vstart.sh script then writes out the ceph.conf
with a keyring option in the [client] section, so when the monitors
start, they can't find a keyring file.  This commit puts the keyring in
the [global] section.

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

diff --git a/src/vstart.sh b/src/vstart.sh
index b1b932a5ed3ff4bcfb41e107d715aed103a2ce84..691aeecad20dda8d2c952631c25dd9d7b641442e 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -272,9 +272,9 @@ EOF
         auth supported = cephx
 EOF
                        cat <<EOF >> $conf
+        keyring = $keyring_fn
 
 [client]
-        keyring = $keyring_fn
 
 [mds]
 $DAEMONOPTS