]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: fix 'cephadm check-host' error output
authorSage Weil <sage@redhat.com>
Fri, 24 Jan 2020 17:42:08 +0000 (11:42 -0600)
committerSage Weil <sage@redhat.com>
Thu, 30 Jan 2020 13:11:38 +0000 (07:11 -0600)
Signed-off-by: Sage Weil <sage@redhat.com>
src/pybind/mgr/cephadm/module.py

index d6e31d5b18e88c5872798812f19c122ab67a6dec..1ce6279a632a202c0a9dde7f977b622e5077be5f 100644 (file)
@@ -925,7 +925,7 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
         out, err, code = self._run_cephadm(host, 'client', 'check-host', [],
                                            error_ok=True, no_fsid=True)
         if code:
-            return 1, '', err
+            return 1, '', ('check-host failed:\n' + '\n'.join(err))
         return 0, '%s ok' % host, err
 
     def _get_connection(self, host):