From: Sage Weil <sage@redhat.com>
Date: Tue, 22 Oct 2019 20:21:29 +0000 (-0500)
Subject: mgr/ssh: be consistently verbose
X-Git-Tag: v15.1.0~1123^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c691f4030ffddda1e1c82add3cd6a61c67df8a4e;p=ceph-ci.git

mgr/ssh: be consistently verbose

Print args and stdin in _run_ceph_daemon; drop various debug lines for
printing keyrings and configs along the way.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/ssh/module.py b/src/pybind/mgr/ssh/module.py
index da46255dda9..481e24c4c40 100644
--- a/src/pybind/mgr/ssh/module.py
+++ b/src/pybind/mgr/ssh/module.py
@@ -451,6 +451,8 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator):
             if not no_fsid:
                 final_args += ['--fsid', self._cluster_fsid]
             final_args += args
+            self.log.debug('args: %s' % final_args)
+            self.log.debug('stdin: %s' % stdin)
 
             script = 'injected_argv = ' + json.dumps(final_args) + '\n'
             if stdin:
@@ -523,13 +525,11 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator):
             'prefix': 'auth get',
             'entity': 'client.bootstrap-osd',
         })
-        self.log.debug('keyring %s' % keyring)
 
         # generate config
         ret, config, err = self.mon_command({
             "prefix": "config generate-minimal-conf",
         })
-        self.log.debug('config %s' % config)
 
         j = json.dumps({
             'config': config,
@@ -576,7 +576,6 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator):
                     'prefix': 'auth get',
                     'entity': 'osd.%s' % str(osd_id),
                 })
-                self.log.debug('keyring %s' % keyring)
                 self._create_daemon(
                     'osd', str(osd_id), host, keyring,
                     extra_args=[
@@ -621,7 +620,6 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator):
             ret, config, err = self.mon_command({
                 "prefix": "config generate-minimal-conf",
             })
-            self.log.debug('config %s' % config)
 
             ret, crash_keyring, err = self.mon_command({
                 'prefix': 'auth get-or-create',
@@ -666,7 +664,6 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator):
             'prefix': 'auth get',
             'entity': 'mon.',
         })
-        self.log.debug('mon keyring %s' % keyring)
 
         return self._create_daemon('mon', host, host, keyring,
                                    extra_args=['--mon-network', network])
@@ -725,7 +722,6 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator):
                      'osd', 'allow *',
                      'mds', 'allow *'],
         })
-        self.log.debug('keyring %s' % keyring)
 
         return self._create_daemon('mgr', host, host, keyring)