]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mgr/cephadm: fix call to cephadm for daemon restarts etc
authorPaul Cuzner <pcuzner@redhat.com>
Wed, 29 Jul 2020 04:00:37 +0000 (16:00 +1200)
committerPaul Cuzner <pcuzner@redhat.com>
Wed, 29 Jul 2020 04:00:37 +0000 (16:00 +1200)
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 <action> <daemon_id>
command.

Fixes: https://tracker.ceph.com/issues/46740
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
src/pybind/mgr/cephadm/module.py

index d88966c79268f68d7946771287dffc99edb96b5f..2f7b5a4a456d0df0093cc420b4aa95239a3a1140 100644 (file)
@@ -1571,7 +1571,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')