import ceph 16.2.6

[ceph.git] / ceph / src / pybind / mgr / orchestrator / module.py

diff --git a/ceph/src/pybind/mgr/orchestrator/module.py b/ceph/src/pybind/mgr/orchestrator/module.py
index 3e3c0b0946199a92b2a146e07165bf6611d43a06..a556c91c0bbf63862326e83b68fb22a38517d9fd 100644 (file)
--- a/ceph/src/pybind/mgr/orchestrator/module.py
+++ b/ceph/src/pybind/mgr/orchestrator/module.py
@@ -346,9 +346,16 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule,
         return self._apply_misc([s], False, Format.plain)
 
     @_cli_write_command('orch host rm')
-    def _remove_host(self, hostname: str) -> HandleCommandResult:
+    def _remove_host(self, hostname: str, force: bool = False, offline: bool = False) -> HandleCommandResult:
         """Remove a host"""
-        completion = self.remove_host(hostname)
+        completion = self.remove_host(hostname, force, offline)
+        raise_if_exception(completion)
+        return HandleCommandResult(stdout=completion.result_str())
+
+    @_cli_write_command('orch host drain')
+    def _drain_host(self, hostname: str) -> HandleCommandResult:
+        """drain all daemons from a host"""
+        completion = self.drain_host(hostname)
         raise_if_exception(completion)
         return HandleCommandResult(stdout=completion.result_str())