From 69743c123c7a88d4108cd9006cc0ed964ed7a3c3 Mon Sep 17 00:00:00 2001
From: Sam Lang <sam.lang@inktank.com>
Date: Thu, 20 Sep 2012 08:54:45 -0700
Subject: [PATCH] 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>
---
 src/vstart.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vstart.sh b/src/vstart.sh
index 43cade6ba1ce5..7c3f92d996d81 100755
--- 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
-- 
2.39.5