From: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Date: Tue, 27 Apr 2021 13:54:46 +0000 (+0200)
Subject: mgr/cephadm: ceph-volume verbose only when fails
X-Git-Tag: v16.2.5~39^2~4^2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F41151%2Fhead;p=ceph.git

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>
(cherry picked from commit 7f67a758d001e3f92be87b262dd81ad48afdc86b)
---

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')