From: Sage Weil <sage@inktank.com>
Date: Wed, 24 Apr 2013 17:13:40 +0000 (-0700)
Subject: mkcephfs: give mon. key 'allow *' mon caps
X-Git-Tag: v0.61~107
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=12bc9a7aa9cb2f47c952dee9abb210dc4eacf470;p=ceph.git

mkcephfs: give mon. key 'allow *' mon caps

This will ease the transition from mkcephfs to ceph-deploy by allowing
ceph-create-keys to use the mon. keyring file in $mon_data and get the
caps it needs.

Fixes: #4756
Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mkcephfs.in b/src/mkcephfs.in
index 87bf7f8040e4..28385686a509 100644
--- a/src/mkcephfs.in
+++ b/src/mkcephfs.in
@@ -423,7 +423,7 @@ if [ $preparemon -eq 1 ]; then
 	--cap mds 'allow' \
 	$dir/keyring.mon
 
-    $BINDIR/ceph-authtool --gen-key -n mon. $dir/keyring.mon
+    $BINDIR/ceph-authtool --gen-key -n mon. $dir/keyring.mon --cap mon 'allow *'
 
     for k in $dir/key.*
     do