Merge pull request #61135 from rkachach/fix_issue_cephadm_services_registry

mgr/cephadm: using service registry pattern for cephadm services

Reviewed-by: Adam King <adking@redhat.com>

diff --cc src/pybind/mgr/cephadm/module.py
Simple merge

diff --cc src/pybind/mgr/cephadm/serve.py
index c689e3d2ee3fc4aa05bd5999e4fbba41605947d2,f2bccb104e490418ea672a36840a9eb21520b885..d3a715a146c2e1af3d6c0757db2b23282ea2bc87
--- 1/src/pybind/mgr/cephadm/serve.py
--- 2/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@@ -1563,9 -1560,10 +1564,9 @@@ class CephadmServe
  
          with set_exception_subject('service', daemon.service_id(), overwrite=True):
  
-             self.mgr.cephadm_services[daemon_type_to_service(daemon_type)].pre_remove(daemon)
+             service_registry.get_service(daemon_type_to_service(daemon_type)).pre_remove(daemon)
              # NOTE: we are passing the 'force' flag here, which means
              # we can delete a mon instances data.
 -            dd = self.mgr.cache.get_daemon(daemon.daemon_name)
              if dd.ports:
                  args = ['--name', name, '--force', '--tcp-ports', ' '.join(map(str, dd.ports))]
              else:

diff --cc src/pybind/mgr/cephadm/services/cephadmservice.py
Simple merge

diff --cc src/pybind/mgr/cephadm/tests/test_services.py
Simple merge

diff --cc src/pybind/mgr/cephadm/upgrade.py
Simple merge