From 27bc5741fcfd095c41f3f9951421d0f6eb62cb05 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 12 Nov 2009 16:12:20 -0800
Subject: [PATCH] vstart: some cleanup

---
 src/vstart.sh | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/vstart.sh b/src/vstart.sh
index c2f0217d27ff5..90adbce585115 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -20,6 +20,10 @@ admin_caps="admin.caps.conf"
 osd_caps="osd.caps.conf"
 mds_caps="mds.caps.conf"
 
+keyring_fn=".ceph_keyring"
+osdmap_fn=".ceph_osdmap"
+monmap_fn=".ceph_monmap"
+
 usage="usage: $0 [option]... [mon] [mds] [osd]\n"
 usage=$usage"options:\n"
 usage=$usage"\t-d, --debug\n"
@@ -179,6 +183,8 @@ $SUDO rm -f out/*
 test -d log && rm -f log/*
 test -d gmon && $SUDO rm -rf gmon/*
 
+test -e $keyring_fn && rm $keyring_fn
+
 
 # figure machine's ip
 if [ "$localhost" -eq 1 ]; then
@@ -193,14 +199,14 @@ echo "ip $IP"
 [ "$CEPH_BIN" = "" ] && CEPH_BIN=.
 [ "$CEPH_PORT" = "" ] && CEPH_PORT=6789
 
-monkeys_fn=monkeys.bin
-CEPH_ADM="$CEPH_BIN/ceph -k $monkeys_fn -I admin"
-test -e $monkeys_fn && rm $monkeys_fn
+CEPH_ADM="$CEPH_BIN/ceph -k $keyring_fn -I admin"
+
+
 
 if [ "$start_mon" -eq 1 ]; then
 	if [ "$new" -eq 1 ]; then
 	# build and inject an initial osd map
-		$CEPH_BIN/osdmaptool --clobber --createsimple $CEPH_NUM_OSD .ceph_osdmap --pg_bits 2
+		$CEPH_BIN/osdmaptool --clobber --createsimple $CEPH_NUM_OSD $osdmap_fn --pg_bits 2
 	fi
 
 	if [ "$new" -eq 1 ]; then
@@ -246,11 +252,10 @@ EOF
 EOF
 		fi
 
-	        $SUDO $CEPH_BIN/authtool --gen-key --name=mon. $monkeys_fn
-	        $SUDO $CEPH_BIN/authtool --gen-key --name=client.admin --caps=$admin_caps $monkeys_fn
+	        $SUDO $CEPH_BIN/authtool --gen-key --name=mon. $keyring_fn
+	        $SUDO $CEPH_BIN/authtool --gen-key --name=client.admin --caps=$admin_caps $keyring_fn
 
 		# build a fresh fs monmap, mon fs
-		# $CEPH_BIN/monmaptool --create --clobber --print .ceph_monmap
 		str="$CEPH_BIN/monmaptool --create --clobber"
 		for f in `seq 0 $((CEPH_NUM_MON-1))`
 		do
@@ -263,14 +268,14 @@ EOF
 EOF
 			fi
 		done
-		str=$str" --print .ceph_monmap"
+		str=$str" --print $monmap_fn"
 		echo $str
 		$str
 
 		for f in `seq 0 $((CEPH_NUM_MON-1))`
 		do
-		    echo $CEPH_BIN/mkmonfs -c $conf --clobber --mon-data dev/mon$f -i $f --monmap=.ceph_monmap --osdmap=.ceph_osdmap --keys-file=$monkeys_fn
-		    $CEPH_BIN/mkmonfs -c $conf --clobber --mon-data=dev/mon$f -i $f --monmap=.ceph_monmap --osdmap=.ceph_osdmap --keys-file=$monkeys_fn
+		    echo $CEPH_BIN/mkmonfs -c $conf --clobber --mon-data dev/mon$f -i $f --monmap=$monmap_fn --osdmap=$osdmap_fn --keys-file=$keyring_fn
+		    $CEPH_BIN/mkmonfs -c $conf --clobber --mon-data=dev/mon$f -i $f --monmap=$monmap_fn --osdmap=$osdmap_fn --keys-file=$keyring_fn
 		done
 	fi
 
@@ -294,13 +299,13 @@ if [ "$start_osd" -eq 1 ]; then
         osd data = dev/osd$osd
         osd journal = dev/osd$osd/journal
         osd journal size = 100
-        keys file = dev/osd$osd/osd$osd.keys.bin
+        keys file = dev/osd$osd/osd$osd.keyring
 EOF
 	    fi
 	    echo mkfs osd$osd
 	    echo $SUDO $CEPH_BIN/cosd -i $osd $ARGS --mkfs # --debug_journal 20 --debug_osd 20 --debug_filestore 20 --debug_ebofs 20
 	    $SUDO $CEPH_BIN/cosd -i $osd $ARGS --mkfs # --debug_journal 20 --debug_osd 20 --debug_filestore 20 --debug_ebofs 20
-	    key_fn=dev/osd$osd/osd$osd.keys.bin
+	    key_fn=dev/osd$osd/osd$osd.keyring
 	    if [ $overwrite_conf -eq 1 ]; then
 		    cat <<EOF > $osd_caps
 ; generated by vstart.sh on `date`
@@ -321,7 +326,7 @@ if [ "$start_mds" -eq 1 ]; then
     mds=0
     for name in a b c d e f g h i j k l m n o p
     do
-        key_fn=dev/mds_$name.keys.bin
+        key_fn=dev/mds.$name.keyring
 	if [ "$new" -eq 1 ]; then
 	    if [ $overwrite_conf -eq 1 ]; then
 	    	cat <<EOF >> $conf
-- 
2.39.5