projects
/
ceph.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
70b495a
)
ceph-volume lvm.prepare pass the cephx_secret for mkfs in filestore
author
Alfredo Deza
<adeza@redhat.com>
Wed, 7 Mar 2018 16:57:07 +0000
(11:57 -0500)
committer
Alfredo Deza
<adeza@redhat.com>
Thu, 8 Mar 2018 20:34:18 +0000
(15:34 -0500)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
src/ceph-volume/ceph_volume/devices/lvm/prepare.py
patch
|
blob
|
history
diff --git
a/src/ceph-volume/ceph_volume/devices/lvm/prepare.py
b/src/ceph-volume/ceph_volume/devices/lvm/prepare.py
index 5d3d03ee9e1147da247afaf7c1fae8b0a85b7b05..ad0d6e62290385d093a2e84cb422f0f00f9695f6 100644
(file)
--- a/
src/ceph-volume/ceph_volume/devices/lvm/prepare.py
+++ b/
src/ceph-volume/ceph_volume/devices/lvm/prepare.py
@@
-67,7
+67,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'):