]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-disk-activate: rely on default/configured keyring path
authorSage Weil <sage@inktank.com>
Tue, 12 Mar 2013 04:15:11 +0000 (21:15 -0700)
committerSage Weil <sage@inktank.com>
Fri, 26 Apr 2013 20:40:03 +0000 (13:40 -0700)
No reason to override the default or configured value here.

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

src/ceph-disk-activate

index 75d745bfcac2823b47a439c37820eecc7994ff76..ef5544ab071e758031a0d4f568dc1f1e0d4bf3c9 100755 (executable)
@@ -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?