From 2deb4263e126506579dbd9f48af417c60da577d5 Mon Sep 17 00:00:00 2001 From: Paul Cuzner Date: Wed, 29 Jul 2020 16:00:37 +1200 Subject: [PATCH] mgr/cephadm: fix call to cephadm for daemon restarts etc The call currently passes the daemon_type as the first parameter - but the function expects the hostname. This results in failures when attempting daemon restarts through the ceph orch daemon command. Fixes: https://tracker.ceph.com/issues/46740 Signed-off-by: Paul Cuzner (cherry picked from commit 94e418581c9126dc199def6078d6a8449bdec8df) --- src/pybind/mgr/cephadm/module.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index e64ae1c1c70d5..11f7d8b56e855 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -1592,7 +1592,7 @@ you may want to run: for a in actions[action]: try: out, err, code = self._run_cephadm( - daemon_spec.daemon_type, name, 'unit', + host, name, 'unit', ['--name', name, a]) except Exception: self.log.exception(f'`{host}: cephadm unit {name} {a}` failed') -- 2.39.5