mgr/cephadm: ceph-volume verbose only when fails

Resolves: https://tracker.ceph.com/issues/50526

Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
This commit is contained in:
Juan Miguel Olmo Martínez 2021-04-27 15:54:46 +02:00
parent 74202456e1
commit 7f67a758d0
No known key found for this signature in database
GPG Key ID: F38428F191BEBAB1

View File

@ -4542,8 +4542,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)
@ -6982,7 +6982,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
@ -7592,11 +7591,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')