From a67d46b63228517cd9ce37617a7e0f5f79ab16f1 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 30 Nov 2017 08:33:21 -0600 Subject: [PATCH] ceph-volume: use --keyfile instead of --key We do not want the key to show up on the command line (it may appear in the process list or sudo log file). Fixes: http://tracker.ceph.com/issues/22283 Signed-off-by: Sage Weil (cherry picked from commit 46abd50f8bcbd347d577581ae42156b718556158) --- src/ceph-volume/ceph_volume/util/prepare.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ceph-volume/ceph_volume/util/prepare.py b/src/ceph-volume/ceph_volume/util/prepare.py index 026ccafae56b6..816f95196a0a6 100644 --- a/src/ceph-volume/ceph_volume/util/prepare.py +++ b/src/ceph-volume/ceph_volume/util/prepare.py @@ -202,7 +202,7 @@ def osd_mkfs_bluestore(osd_id, fsid, keyring=None, wal=False, db=False): ] if keyring is not None: - base_command.extend(['--key', keyring]) + base_command.extend(['--keyfile', '-']) if wal: base_command.extend( @@ -218,7 +218,7 @@ def osd_mkfs_bluestore(osd_id, fsid, keyring=None, wal=False, db=False): command = base_command + supplementary_command - process.run(command, obfuscate='--key') + process.call(command, stdin=keyring) def osd_mkfs_filestore(osd_id, fsid): -- 2.39.5