Revert "ceph-disk-activate: rely on default/configured keyring path"

This reverts commit 936b8f20af1d390976097c427b6e92da4b39b218.

This is necessary because we mount the osd in a temporary location.

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit b6102c0945a0d68b7c5ff7f2254a1a994788ca0f)

diff --git a/src/ceph-disk-activate b/src/ceph-disk-activate
index d64e53e030694cb4fa9ae2eb0770f92fe619ea37..1eb696490e3927d715e7ca28231a4a9a527b5228 100755 (executable)
--- a/src/ceph-disk-activate
+++ b/src/ceph-disk-activate
@@ -236,6 +236,7 @@ def mkfs(
             '--osd-data', path,
             '--osd-journal', os.path.join(path, 'journal'),
             '--osd-uuid', fsid,
+            '--keyring', os.path.join(path, 'keyring'),
             ],
         )
     # TODO ceph-osd --mkfs removes the monmap file?