From: Sage Weil <sage@inktank.com>
Date: Tue, 12 Mar 2013 04:15:11 +0000 (-0700)
Subject: ceph-disk-activate: rely on default/configured keyring path
X-Git-Tag: v0.56.5~5^2~50
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=739b013cfa4b84d36750b80ce44579498e7ea4f4;p=ceph.git

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

No reason to override the default or configured value here.

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

diff --git a/src/ceph-disk-activate b/src/ceph-disk-activate
index 75d745bfcac2..ef5544ab071e 100755
--- a/src/ceph-disk-activate
+++ b/src/ceph-disk-activate
@@ -235,7 +235,6 @@ def mkfs(
             '--monmap', monmap,
             '--osd-data', path,
             '--osd-uuid', fsid,
-            '--keyring', os.path.join(path, 'keyring'),
             ],
         )
     # TODO ceph-osd --mkfs removes the monmap file?