From: Sage Weil <sage@redhat.com>
Date: Fri, 6 Mar 2020 03:22:37 +0000 (-0600)
Subject: mgr/cephadm: fix error-path return values for _run_cephadm
X-Git-Tag: v15.1.1~83^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4e829f1df0444dfdcb54de293650a205ff157ab3;p=ceph-ci.git

mgr/cephadm: fix error-path return values for _run_cephadm

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 68ea674b5d7..6771a44edfb 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1453,7 +1453,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
                 except RuntimeError as e:
                     self._reset_con(host)
                     if error_ok:
-                        return '', str(e), 1
+                        return [], [str(e)], 1
                     raise
             elif self.mode == 'cephadm-package':
                 try:
@@ -1464,7 +1464,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
                 except RuntimeError as e:
                     self._reset_con(host)
                     if error_ok:
-                        return '', str(e), 1
+                        return [], [str(e)], 1
                     raise
             else:
                 assert False, 'unsupported mode'