mgr/cephadm: do not reconfig unmanaged services

Fixes: https://tracker.ceph.com/issues/44615
Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 5379825722231315e94d76cf35c6edb99d939f7e..baefd0c12b18483b2e9d37f5f8623971830b3af1 100644 (file)
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -2430,13 +2430,17 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
         grafanas = []  # type: List[orchestrator.DaemonDescription]
         for dd in daemons:
             # orphan?
-            if dd.service_name() not in self.spec_store.specs and \
-               dd.daemon_type not in ['mon', 'mgr', 'osd']:
+            spec = self.spec_store.specs.get(dd.service_name(), None)
+            if not spec and dd.daemon_type not in ['mon', 'mgr', 'osd']:
                 # (mon and mgr specs should always exist; osds aren't matched
                 # to a service spec)
                 self.log.info('Removing orphan daemon %s...' % dd.name())
                 self._remove_daemon(dd.name(), dd.hostname)
 
+            # ignore unmanaged services
+            if not spec or spec.unmanaged:
+                continue
+
             # dependencies?
             if dd.daemon_type == 'grafana':
                 # put running instances at the front of the list