From 8a193ba50ca8c0c3efb5c062c4fedb93f3685933 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Juan=20Miguel=20Olmo=20Mart=C3=ADnez?= Date: Tue, 1 Jun 2021 17:14:16 +0200 Subject: [PATCH] mgr/cephadm: fix errors in command help and documentation MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Resolves: https://tracker.ceph.com/issues/51043 Signed-off-by: Juan Miguel Olmo Martínez (cherry picked from commit cd5584f86b782732bb9f2a4480298a271d639901) --- doc/cephadm/osd.rst | 4 ++-- src/pybind/mgr/orchestrator/module.py | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/cephadm/osd.rst b/doc/cephadm/osd.rst index 55ddd4c6616..5c01d038f84 100644 --- a/doc/cephadm/osd.rst +++ b/doc/cephadm/osd.rst @@ -268,7 +268,7 @@ It is possible to stop queued OSD removals by using the following command: .. prompt:: bash # - ceph orch osd rm stop + ceph orch osd rm stop Example: @@ -288,7 +288,7 @@ Replacing an OSD .. prompt:: bash # - orch osd rm --replace [--force] + orch osd rm --replace [--force] Example: diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py index 082df699f03..3e3c0b09461 100644 --- a/src/pybind/mgr/orchestrator/module.py +++ b/src/pybind/mgr/orchestrator/module.py @@ -814,24 +814,24 @@ Usage: @_cli_write_command('orch osd rm') def _osd_rm_start(self, - svc_id: List[str], + osd_id: List[str], replace: bool = False, force: bool = False) -> HandleCommandResult: - """Remove OSD services""" - completion = self.remove_osds(svc_id, replace=replace, force=force) + """Remove OSD daemons""" + completion = self.remove_osds(osd_id, replace=replace, force=force) raise_if_exception(completion) return HandleCommandResult(stdout=completion.result_str()) @_cli_write_command('orch osd rm stop') - def _osd_rm_stop(self, svc_id: List[str]) -> HandleCommandResult: + def _osd_rm_stop(self, osd_id: List[str]) -> HandleCommandResult: """Cancel ongoing OSD removal operation""" - completion = self.stop_remove_osds(svc_id) + completion = self.stop_remove_osds(osd_id) raise_if_exception(completion) return HandleCommandResult(stdout=completion.result_str()) @_cli_write_command('orch osd rm status') def _osd_rm_status(self, format: Format = Format.plain) -> HandleCommandResult: - """status of OSD removal operation""" + """Status of OSD removal operation""" completion = self.remove_osds_status() raise_if_exception(completion) report = completion.result -- 2.47.3