From: Yehuda Sadeh <yehuda@inktank.com>
Date: Thu, 31 May 2012 18:38:37 +0000 (-0700)
Subject: vstart.sh: initialize keyring even if not using cephx
X-Git-Tag: v0.48argonaut~154
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8609caffd9dfa825a5896687b6977afa1be48ae5;p=ceph.git

vstart.sh: initialize keyring even if not using cephx

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index 5e39c7cb011c2..ccd7eb032c1d7 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -298,8 +298,8 @@ EOF
 			echo
 		fi
 
-	        [ "$cephx" -eq 1 ] && $SUDO $CEPH_BIN/ceph-authtool --create-keyring --gen-key --name=mon. $keyring_fn
-	        [ "$cephx" -eq 1 ] && $SUDO $CEPH_BIN/ceph-authtool --gen-key --name=client.admin --set-uid=0 \
+	        $SUDO $CEPH_BIN/ceph-authtool --create-keyring --gen-key --name=mon. $keyring_fn
+	        $SUDO $CEPH_BIN/ceph-authtool --gen-key --name=client.admin --set-uid=0 \
 		    --cap mon 'allow *' \
 		    --cap osd 'allow *' \
 		    --cap mds allow \
@@ -372,11 +372,9 @@ EOF
 	    $SUDO $CEPH_ADM osd crush set $osd osd.$osd 1.0 host=localhost rack=localrack pool=default
 	    $SUDO $CEPH_BIN/ceph-osd -i $osd $ARGS --mkfs --mkkey --osd-uuid $uuid
 
-	    if [ "$cephx" -eq 1 ]; then
-		key_fn=dev/osd$osd/keyring
-		echo adding osd$osd key to auth repository
-		$SUDO $CEPH_ADM -i $key_fn auth add osd.$osd osd "allow *" mon "allow rwx"
-	    fi
+	    key_fn=dev/osd$osd/keyring
+	    echo adding osd$osd key to auth repository
+	    $SUDO $CEPH_ADM -i $key_fn auth add osd.$osd osd "allow *" mon "allow rwx"
 	fi
 	echo start osd$osd
 	run 'osd' $SUDO $CEPH_BIN/ceph-osd -i $osd $ARGS $COSD_ARGS