From: Adam King <47704447+adk3798@users.noreply.github.com>
Date: Thu, 30 Jan 2025 16:43:58 +0000 (-0500)
Subject: Merge pull request #61135 from rkachach/fix_issue_cephadm_services_registry
X-Git-Tag: v20.0.0~287
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4429ff6bcd0151b80a838467090304b393f2f8b8;p=ceph.git

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>
---

4429ff6bcd0151b80a838467090304b393f2f8b8
diff --cc src/pybind/mgr/cephadm/serve.py
index c689e3d2ee3fc,f2bccb104e490..d3a715a146c2e
--- a/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: