From: Sage Weil <sage@redhat.com>
Date: Fri, 13 Mar 2020 18:58:01 +0000 (-0500)
Subject: mgr/cephadm: respect 'unmanaged' flag in spec
X-Git-Tag: v15.2.0~38^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33955%2Fhead;p=ceph.git

mgr/cephadm: respect 'unmanaged' flag in spec

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 f8a978947e1b..03f0c1ecfe71 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -2220,6 +2220,11 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
         on the target label and count specified in the placement.
         """
         daemon_type = spec.service_type
+        service_name = spec.service_name()
+        if spec.unmanaged:
+            self.log.debug('Skipping unmanaged service %s spec' % service_name)
+            return False
+        self.log.debug('Applying service %s spec' % service_name)
         create_fns = {
             'mon': self._create_mon,
             'mgr': self._create_mgr,
@@ -2242,8 +2247,6 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
             return trivial_result([])
         config_func = config_fns.get(daemon_type, None)
 
-        service_name = spec.service_name()
-        self.log.debug('Applying service %s spec' % service_name)
         daemons = self.cache.get_daemons_by_service(service_name)
         hosts = HostAssignment(
             spec=spec,