From: Kefu Chai <kchai@redhat.com>
Date: Mon, 10 Oct 2016 10:43:39 +0000 (+0800)
Subject: doc: fill keyring with caps before passing it to ceph-monstore-tool
X-Git-Tag: v10.2.4~41^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=25a35d43a8bf7e1a7d78d5d1d2a5556dff98f5e8;p=ceph.git

doc: fill keyring with caps before passing it to ceph-monstore-tool

to make sure the recovered monitor store is ready for use.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit af8e21163735377071b6832d8a81b035bb835257)
---

diff --git a/doc/rados/troubleshooting/troubleshooting-mon.rst b/doc/rados/troubleshooting/troubleshooting-mon.rst
index a9feb6d2a1d7f..a50db4cb9eb3f 100644
--- a/doc/rados/troubleshooting/troubleshooting-mon.rst
+++ b/doc/rados/troubleshooting/troubleshooting-mon.rst
@@ -430,8 +430,13 @@ information stored in OSDs.::
     rsync -avz user@host:$ms $ms
   done
   # rebuild the monitor store from the collected map, if the cluster does not
-  # use cephx authentication, there is no need to pass the "--keyring" option.
-  # i.e. use "ceph-monstore-tool /tmp/mon-store rebuild" instead
+  # use cephx authentication, we can skip the following steps to update the
+  # keyring with the caps, and there is no need to pass the "--keyring" option.
+  # i.e. just use "ceph-monstore-tool /tmp/mon-store rebuild" instead
+  ceph-authtool /path/to/admin.keyring -n mon. \
+    --cap mon allow 'allow *'
+  ceph-authtool /path/to/admin.keyring -n client.admin \
+    --cap mon allow 'allow *' --cap osd 'allow *' --cap mds 'allow *'
   ceph-monstore-tool /tmp/mon-store rebuild -- --keyring /path/to/admin.keyring
   # backup corrupted store.db just in case
   mv /var/lib/ceph/mon/mon.0/store.db /var/lib/ceph/mon/mon.0/store.db.corrupted