From a6ecf9288af248656bc712c1a4de910ff107a9a2 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Thu, 14 Mar 2013 12:05:52 -0700
Subject: [PATCH] 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)
---
 src/ceph-disk-activate | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ceph-disk-activate b/src/ceph-disk-activate
index d64e53e030694..1eb696490e392 100755
--- 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?
-- 
2.39.5