From dd7acdf9c902bb73e417a22886961e80ab4b5ff9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Juan=20Miguel=20Olmo=20Mart=C3=ADnez?= Date: Tue, 27 Apr 2021 15:54:46 +0200 Subject: [PATCH] mgr/cephadm: ceph-volume verbose only when fails MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Resolves: https://tracker.ceph.com/issues/50526 Signed-off-by: Juan Miguel Olmo Martínez (cherry picked from commit 7f67a758d001e3f92be87b262dd81ad48afdc86b) --- src/cephadm/cephadm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 763e42c7daf6..5dce6d389166 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -4572,8 +4572,8 @@ def command_ceph_volume(ctx): privileged=True, volume_mounts=mounts, ) - verbosity = CallVerbosity.VERBOSE if ctx.log_output else CallVerbosity.VERBOSE_ON_FAILURE - out, err, code = call_throws(ctx, c.run_cmd(), verbosity=verbosity) + + out, err, code = call_throws(ctx, c.run_cmd()) if not code: print(out) @@ -7079,7 +7079,6 @@ class CephadmDaemon(): # expects to use self.ctx.command = 'inventory --format=json'.split() self.ctx.fsid = self.fsid - self.ctx.log_output = False ctr = 0 exception_encountered = False @@ -7697,11 +7696,6 @@ def _get_parser(): parser_ceph_volume.add_argument( '--keyring', '-k', help='ceph.keyring to pass through to the container') - parser_ceph_volume.add_argument( - '--log-output', - action='store_true', - default=True, - help='suppress ceph volume output from the log') parser_ceph_volume.add_argument( 'command', nargs=argparse.REMAINDER, help='command') -- 2.47.3