From: Sage Weil <sage@newdream.net>
Date: Fri, 17 Sep 2010 18:38:04 +0000 (-0700)
Subject: vstart.sh: use new cauthtool --cap syntax
X-Git-Tag: v0.22~151
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2dbc44e66cf53af0231fb1dbce6474512e828127;p=ceph.git

vstart.sh: use new cauthtool --cap syntax
---

diff --git a/src/vstart.sh b/src/vstart.sh
index 282ce17a2ff7..308f932de821 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -20,9 +20,6 @@ cephx=0
 MON_ADDR=""
 
 conf="ceph.conf"
-admin_caps="admin.caps.conf"
-osd_caps="osd.caps.conf"
-mds_caps="mds.caps.conf"
 
 keyring_fn=".ceph_keyring"
 osdmap_fn=".ceph_osdmap"
@@ -288,17 +285,12 @@ EOF
 			echo
 		fi
 
-		if [ $overwrite_conf -eq 1 ]; then
-			cat <<EOF > $admin_caps
-; generated by vstart.sh on `date`
-	mon = "allow *"
-	osd = "allow *"
-	mds = "allow"
-EOF
-		fi
-
 	        [ "$cephx" -eq 1 ] && $SUDO $CEPH_BIN/cauthtool --create-keyring --gen-key --name=mon. $keyring_fn
-	        [ "$cephx" -eq 1 ] && $SUDO $CEPH_BIN/cauthtool --gen-key --name=client.admin --set-uid=0 --caps=$admin_caps $keyring_fn
+	        [ "$cephx" -eq 1 ] && $SUDO $CEPH_BIN/cauthtool --gen-key --name=client.admin --set-uid=0 \
+		    --cap mon 'allow *' \
+		    --cap osd 'allow *' \
+		    --cap mds allow \
+		    $keyring_fn
 
 		# build a fresh fs monmap, mon fs
 		str="$CEPH_BIN/monmaptool --create --clobber"
@@ -364,14 +356,10 @@ EOF
 
 	    if [ "$cephx" -eq 1 ]; then
 		key_fn=dev/osd$osd/keyring.bin
-		if [ $overwrite_conf -eq 1 ]; then
-		    cat <<EOF > $osd_caps
-; generated by vstart.sh on `date`
-	mon = "allow *"
-	osd = "allow *"
-EOF
-		fi
-		$SUDO $CEPH_BIN/cauthtool --create-keyring --gen-key --name=osd.$osd --caps=$osd_caps $key_fn
+		$SUDO $CEPH_BIN/cauthtool --create-keyring --gen-key --name=osd.$osd \
+		    --cap mon 'allow *' \
+		    --cap osd 'allow *' \
+		    $key_fn
 		echo adding osd$osd key to auth repository
 		$SUDO $CEPH_ADM -i $key_fn auth add osd.$osd
 	    fi
@@ -401,16 +389,14 @@ EOF
 		if [ "$cephx" -eq 1 ]; then
 	    	    cat <<EOF >> $conf
         keyring = $key_fn
-EOF
-		    cat <<EOF > $mds_caps
-; generated by vstart.sh on `date`
-	mon = "allow *"
-	osd = "allow *"
-	mds = "allow"
 EOF
 		fi
 	    fi
-	    $SUDO $CEPH_BIN/cauthtool --create-keyring --gen-key --name=mds.$name --caps=$mds_caps $key_fn
+	    $SUDO $CEPH_BIN/cauthtool --create-keyring --gen-key --name=mds.$name \
+		--cap mon 'allow *' \
+		--cap osd 'allow *' \
+		--cap mds 'allow' \
+		$key_fn
 	    $SUDO $CEPH_ADM -i $key_fn auth add mds.$name
 	fi