Merge pull request #36147 from mgfritch/cephadm-service-fixup-mypy

mgr/cephadm: clean-up service module type checking

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

diff --cc src/pybind/mgr/cephadm/module.py
index 73459d3f2336b265f7f6fab9ee4664e35c66ee20,8fec091c63d7cfc3c93128e94ce65462fce26a84..55e0dbf2a1542cdf393ad7f5bf49391113fe3542
--- 1/src/pybind/mgr/cephadm/module.py
--- 2/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@@ -1813,27 -1781,20 +1813,27 @@@ you may want to run
          """
          (daemon_type, daemon_id) = name.split('.', 1)
  
 -        self.cephadm_services[daemon_type].pre_remove(daemon_id)
 +        with set_exception_subject('service', orchestrator.DaemonDescription(
 +                daemon_type=daemon_type,
 +                daemon_id=daemon_id,
 +                hostname=host,
 +        ).service_id(), overwrite=True):
 +
  
 -        args = ['--name', name, '--force']
 -        self.log.info('Removing daemon %s from %s' % (name, host))
 -        out, err, code = self._run_cephadm(
 -            host, name, 'rm-daemon', args)
 -        if not code:
 -            # remove item from cache
 -            self.cache.rm_daemon(host, name)
 -        self.cache.invalidate_host_daemons(host)
 -        return "Removed {} from host '{}'".format(name, host)
 +            self.cephadm_services[daemon_type].pre_remove(daemon_id)
 +
 +            args = ['--name', name, '--force']
 +            self.log.info('Removing daemon %s from %s' % (name, host))
 +            out, err, code = self._run_cephadm(
 +                host, name, 'rm-daemon', args)
 +            if not code:
 +                # remove item from cache
 +                self.cache.rm_daemon(host, name)
 +            self.cache.invalidate_host_daemons(host)
 +            return "Removed {} from host '{}'".format(name, host)
  
      def _config_fn(self, service_type) -> Optional[Callable[[ServiceSpec], None]]:
-         return {
+         fn = {
              'mds': self.mds_service.config,
              'rgw': self.rgw_service.config,
              'nfs': self.nfs_service.config,