vstart: use fs authorize to create master client key

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/src/vstart.sh b/src/vstart.sh
index 8ed75cfc15ab3c2abcfc7dc45dff055009d3269c..2cbf9f42248a79ee3494cb66724e048b9f97c82c 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -771,12 +771,6 @@ start_mon() {
              --cap mgr 'allow *' \
              "$keyring_fn"
 
-        prun $SUDO "$CEPH_BIN/ceph-authtool" --gen-key --name=client.fs\
-             --cap mon 'allow r' \
-             --cap osd 'allow rw tag cephfs data=*' \
-             --cap mds 'allow rwp' \
-             "$keyring_fn"
-
         # build a fresh fs monmap, mon fs
         local params=()
         local count=0
@@ -1226,6 +1220,8 @@ fi
 
 if [ $CEPH_NUM_MDS -gt 0 ]; then
     start_mds
+    # key with access to all FS
+    ceph_adm fs authorize \* "client.fs" / rwp >> "$keyring_fn"
 fi
 
 # Don't set max_mds until all the daemons are started, otherwise