]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume lvm.prepare pass the cephx_secret for mkfs in filestore
authorAlfredo Deza <adeza@redhat.com>
Wed, 7 Mar 2018 16:57:07 +0000 (11:57 -0500)
committerAlfredo Deza <adeza@redhat.com>
Wed, 1 Aug 2018 14:39:23 +0000 (10:39 -0400)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit b25c8f6897bd66a7156c3a59724cd85eb835c5b6)

src/ceph-volume/ceph_volume/devices/lvm/prepare.py

index 2369cb6f3a58d5d7e0a427e12cd8b7d136b88430..718515e2b0e71532c04d675fff6a6a8a43b40f0e 100644 (file)
@@ -69,7 +69,7 @@ def prepare_filestore(device, journal, secrets, tags, osd_id, fsid):
     # get the latest monmap
     prepare_utils.get_monmap(osd_id)
     # prepare the osd filesystem
-    prepare_utils.osd_mkfs_filestore(osd_id, fsid)
+    prepare_utils.osd_mkfs_filestore(osd_id, fsid, cephx_secret)
     # write the OSD keyring if it doesn't exist already
     prepare_utils.write_keyring(osd_id, cephx_secret)
     if secrets.get('dmcrypt_key'):