From: Sage Weil <sage@newdream.net>
Date: Thu, 11 Feb 2010 23:21:27 +0000 (-0800)
Subject: mkcephfs: put admin keyring in mon_data, for safe keeping
X-Git-Tag: v0.19~44
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6bfb95cc02f2ac1e70ab6dc668a547da4de10e3d;p=ceph.git

mkcephfs: put admin keyring in mon_data, for safe keeping
---

diff --git a/src/mkcephfs.in b/src/mkcephfs.in
index ea594e36b570..ff23a5618c7e 100644
--- a/src/mkcephfs.in
+++ b/src/mkcephfs.in
@@ -197,6 +197,12 @@ for name in $what; do
 	fi
 	get_conf mon_data "" "mon data"
 	do_cmd "$BINDIR/mkmonfs $clobber --mon-data $mon_data -i $num --monmap $monmap --osdmap $osdmap -k $tmpkeyring ; rm $tmpkeyring"
+
+	if [ -n "$ssh" ]; then
+	    scp $adminkeyring $user@$host:$mon_data/admin_keyring.bin
+	else
+	    cp -v $adminkeyring $mon_data/admin_keyring.bin
+	fi
     fi
 
     if [ "$type" = "osd" ]; then