From 59f91b515e608e6755984b0588d5f246724d4cc3 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Wed, 7 Mar 2018 11:56:45 -0500 Subject: [PATCH] ceph-volume util.prepare use keyfile from stdin for mkfs in filestore Signed-off-by: Alfredo Deza (cherry picked from commit 70b495ac06b1fa382654759764014d5391d67f9a) --- src/ceph-volume/ceph_volume/util/prepare.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ceph-volume/ceph_volume/util/prepare.py b/src/ceph-volume/ceph_volume/util/prepare.py index 2c36ba0ec450c..319964401f768 100644 --- a/src/ceph-volume/ceph_volume/util/prepare.py +++ b/src/ceph-volume/ceph_volume/util/prepare.py @@ -339,7 +339,7 @@ def osd_mkfs_bluestore(osd_id, fsid, keyring=None, wal=False, db=False): raise RuntimeError('Command failed with exit code %s: %s' % (returncode, ' '.join(command))) -def osd_mkfs_filestore(osd_id, fsid): +def osd_mkfs_filestore(osd_id, fsid, keyring): """ Create the files for the OSD to function. A normal call will look like: @@ -359,7 +359,7 @@ def osd_mkfs_filestore(osd_id, fsid): system.chown(journal) system.chown(path) - process.run([ + command = [ 'ceph-osd', '--cluster', conf.cluster, # undocumented flag, sets the `type` file to contain 'filestore' @@ -367,9 +367,11 @@ def osd_mkfs_filestore(osd_id, fsid): '--mkfs', '-i', osd_id, '--monmap', monmap, + '--keyfile', '-', # goes through stdin '--osd-data', path, '--osd-journal', journal, '--osd-uuid', fsid, '--setuser', 'ceph', '--setgroup', 'ceph' - ]) + ] + process.call(command, stdin=keyring, terminal_verbose=True, show_command=True) -- 2.39.5