From 11890948ab8236c5856c619d98158eba5b24423a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 13 Mar 2020 13:58:01 -0500 Subject: [PATCH] mgr/cephadm: respect 'unmanaged' flag in spec Signed-off-by: Sage Weil --- src/pybind/mgr/cephadm/module.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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, -- 2.47.3