From: Sage Weil <sage@redhat.com>
Date: Mon, 24 Feb 2020 15:54:45 +0000 (-0600)
Subject: mgr/cephadm: drop mixin parent
X-Git-Tag: v15.1.1~283^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33514%2Fhead;p=ceph.git

mgr/cephadm: drop mixin parent

This was added a while back to let us block on completions, but that
code has since been removed.

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 0a5ea3b06690..7cfe2dc8acd2 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -421,7 +421,7 @@ def trivial_result(val):
 
 
 @six.add_metaclass(CLICommandMeta)
-class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
+class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
 
     _STORE_HOST_PREFIX = "host"