From: Daniel-Pivonka Date: Mon, 3 Aug 2020 19:28:35 +0000 (-0400) Subject: mgr/orchestrator: fix placement of '1' activating dry-run bug X-Git-Tag: wip-pdonnell-testing-20200918.022351~455^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9f7c8f71fc19bf0b123dd2e76ea8025ed0b8ccc9;p=ceph-ci.git mgr/orchestrator: fix placement of '1' activating dry-run bug when applying a placement of '1' for mon, mgr, rbd-mirror, crash, alertmanager, grafana, node-exporter, prometheus, or mds a dry-run was activated Fixes: https://tracker.ceph.com/issues/46819 Signed-off-by: Daniel-Pivonka --- diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py index cd52f1fdb9d..880dabb0f78 100644 --- a/src/pybind/mgr/orchestrator/module.py +++ b/src/pybind/mgr/orchestrator/module.py @@ -1135,17 +1135,17 @@ Usage: @_cli_write_command( 'orch apply', 'name=service_type,type=CephChoices,strings=mon|mgr|rbd-mirror|crash|alertmanager|grafana|node-exporter|prometheus,req=false ' - 'name=dry_run,type=CephBool,req=false ' 'name=placement,type=CephString,req=false ' + 'name=dry_run,type=CephBool,req=false ' 'name=format,type=CephChoices,strings=plain|json|json-pretty|yaml,req=false ' 'name=unmanaged,type=CephBool,req=false', 'Update the size or placement for a service or apply a large yaml spec') def _apply_misc(self, service_type: Optional[str] = None, placement: Optional[str] = None, - unmanaged: bool = False, dry_run: bool = False, format: str = 'plain', + unmanaged: bool = False, inbuf: Optional[str] = None) -> HandleCommandResult: usage = """Usage: ceph orch apply -i [--dry-run] @@ -1184,8 +1184,8 @@ Usage: @_cli_write_command( 'orch apply mds', 'name=fs_name,type=CephString ' - 'name=dry_run,type=CephBool,req=false ' 'name=placement,type=CephString,req=false ' + 'name=dry_run,type=CephBool,req=false ' 'name=unmanaged,type=CephBool,req=false ' 'name=format,type=CephChoices,strings=plain|json|json-pretty|yaml,req=false', 'Update the number of MDS instances for the given fs_name') @@ -1193,8 +1193,8 @@ Usage: fs_name: str, placement: Optional[str] = None, dry_run: bool = False, - format: str = 'plain', unmanaged: bool = False, + format: str = 'plain', inbuf: Optional[str] = None) -> HandleCommandResult: if inbuf: raise OrchestratorValidationError('unrecognized command -i; -h or --help for usage')