From: Sage Weil <sage@redhat.com>
Date: Wed, 18 Mar 2020 15:09:00 +0000 (-0500)
Subject: mgr/cephadm: do not reconfig unmanaged services
X-Git-Tag: v15.2.0~18^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ba826774087acaedf8bb1abbef44115429268417;p=ceph.git

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 537982572223..baefd0c12b18 100644
--- 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