From: Sage Weil <sage@redhat.com>
Date: Fri, 24 Jan 2020 17:42:08 +0000 (-0600)
Subject: mgr/cephadm: fix 'cephadm check-host' error output
X-Git-Tag: v15.1.1~568^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5ea0472d5af1d2ea566e6afe99cc2ebf3b6db9b4;p=ceph-ci.git

mgr/cephadm: fix 'cephadm check-host' error output

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

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index d6e31d5b18e..1ce6279a632 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -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):