mgr/cephadm: remove check for manages_own_next_action

Now all service classes will use a choose_next_action method that
they've customized or one inherited from the base class.

Signed-off-by: John Mulligan <jmulligan@redhat.com>

diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py
index a3af2ad10dbdce76ae95486b8ddde42812793b3b..c98321e8111b959eb5a5597c169df4cd07743bc4 100644 (file)
--- a/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@ -1173,7 +1173,7 @@ class CephadmServe:
                     f'{dd.name()} daemon entrypoint args {dd.extra_entrypoint_args} -> {spec.extra_entrypoint_args}')
                 dd.extra_entrypoint_args = spec.extra_entrypoint_args
                 action = 'redeploy'
-            elif svc_obj.manages_own_next_action:
+            else:
                 # method uses new action enum type
                 _scheduled_action = utils.Action.create(scheduled_action)
                 _action = svc_obj.choose_next_action(
@@ -1197,10 +1197,6 @@ class CephadmServe:
                     )
                     # convert back to legacy str type
                     action = str(_action)
-            elif last_deps != deps:
-                sym_diff = set(deps).symmetric_difference(last_deps)
-                self.log.info(f'Reconfiguring {dd.name()} deps {last_deps} -> {deps} (diff {sym_diff})')
-                action = 'reconfig'
             action = _ceph_service_next_action(
                 action, dd.daemon_type, dd.name(), self.mgr, last_config
             )