From 5d8cfb149b34d068b4dd6942e9a38e40aced299f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 22 May 2021 13:28:37 -0400 Subject: [PATCH] mgr/orchestrator: clean up 'orch {daemon add,apply} rgw' args Make placement the only optional positional. This means that the "usual" 'orch orch apply 3' will do placement=3. Signed-off-by: Sage Weil --- src/pybind/mgr/orchestrator/module.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py index faa4671707e..f3c8d2ccf92 100644 --- a/src/pybind/mgr/orchestrator/module.py +++ b/src/pybind/mgr/orchestrator/module.py @@ -901,9 +901,10 @@ Usage: @_cli_write_command('orch daemon add rgw') def _rgw_add(self, svc_id: str, + placement: Optional[str] = None, + _end_positional_: int = 0, port: Optional[int] = None, ssl: bool = False, - placement: Optional[str] = None, inbuf: Optional[str] = None) -> HandleCommandResult: """Start RGW daemon(s)""" if inbuf: @@ -1091,11 +1092,12 @@ Usage: @_cli_write_command('orch apply rgw') def _apply_rgw(self, svc_id: str, + placement: Optional[str] = None, + _end_positional_: int = 0, realm: Optional[str] = None, zone: Optional[str] = None, port: Optional[int] = None, ssl: bool = False, - placement: Optional[str] = None, dry_run: bool = False, format: Format = Format.plain, unmanaged: bool = False, -- 2.47.3