]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: fix error-path return values for _run_cephadm
authorSage Weil <sage@redhat.com>
Fri, 6 Mar 2020 03:22:37 +0000 (21:22 -0600)
committerSage Weil <sage@redhat.com>
Fri, 6 Mar 2020 03:23:12 +0000 (21:23 -0600)
Signed-off-by: Sage Weil <sage@redhat.com>
src/pybind/mgr/cephadm/module.py

index 68ea674b5d7e79006623c155f9943c203dda2d17..6771a44edfb1d2589b50c01f7ef9febc8393e372 100644 (file)
@@ -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'