From c66371764584750c825c11ecddd345b97f0bb502 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 17 Jan 2020 12:56:30 -0600 Subject: [PATCH] mgr/cephadm: revert to OrchestratorClientMixin child self.mgr does not exist--I can't figure out what this 'mgr' reference is and where it comes from. So reverting to being a child for the time being; we can clean this up later. Signed-off-by: Sage Weil --- src/pybind/mgr/cephadm/module.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index 0cc405ba37e..529ad0af3ab 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -264,7 +264,7 @@ def with_services(service_type=None, return wrapper return decorator -class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule): +class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin): _STORE_HOST_PREFIX = "host" @@ -560,13 +560,11 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule): def serve(self): # type: () -> None self.log.info("serve starting") - orch_client = orchestrator.OrchestratorClientMixin() - orch_client.set_mgr(self.mgr) while self.run: while self.upgrade_state and not self.upgrade_state.get('paused'): self.log.debug('Upgrade in progress, refreshing services') completion = self._get_services() - orch_client._orchestrator_wait([completion]) + self._orchestrator_wait([completion]) orchestrator.raise_if_exception(completion) self.log.debug('services %s' % completion.result) completion = self._do_upgrade(completion.result) -- 2.39.5