From: Sam Lang <sam.lang@inktank.com>
Date: Wed, 19 Sep 2012 20:22:59 +0000 (-0700)
Subject: Move keyring option to global section
X-Git-Tag: v0.53~79^2~5
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0f7c516f3e1f37c5869f8fbff67f53ca0c90568c;p=ceph.git

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 b1b932a5ed3ff..691aeecad20dd 100755
--- 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