From 4e829f1df0444dfdcb54de293650a205ff157ab3 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 5 Mar 2020 21:22:37 -0600 Subject: [PATCH] mgr/cephadm: fix error-path return values for _run_cephadm Signed-off-by: Sage Weil --- src/pybind/mgr/cephadm/module.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index 68ea674b5d7e7..6771a44edfb1d 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' -- 2.39.5