From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 15 Oct 2019 17:45:00 +0000 (-0700)
Subject: vstart: use fs authorize to create master client key
X-Git-Tag: v15.1.0~1178^2~6^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a34eb115cfdfe711ddce67a84ac8c341dcfa555f;p=ceph-ci.git

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 8ed75cfc15a..2cbf9f42248 100755
--- 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