From aac2d571f7a9f83440dbaa16abcaf9b6a2e86260 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 12 Feb 2020 14:39:02 -0600 Subject: [PATCH] mgr/orch: orch * add -> orch daemon add * Adjust help string too Signed-off-by: Sage Weil --- src/pybind/mgr/orchestrator_cli/module.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/pybind/mgr/orchestrator_cli/module.py b/src/pybind/mgr/orchestrator_cli/module.py index 46717993a37..9e07c109051 100644 --- a/src/pybind/mgr/orchestrator_cli/module.py +++ b/src/pybind/mgr/orchestrator_cli/module.py @@ -388,10 +388,10 @@ Usage: return HandleCommandResult(stdout=completion.result_str()) @orchestrator._cli_write_command( - 'orch rbd-mirror add', + 'orch daemon add rbd-mirror', "name=num,type=CephInt,req=false " "name=hosts,type=CephString,n=N,req=false", - 'Create an rbd-mirror service') + 'Start rbd-mirror daemon(s)') def _rbd_mirror_add(self, num=None, hosts=None): spec = orchestrator.ServiceSpec( None, @@ -402,11 +402,11 @@ Usage: return HandleCommandResult(stdout=completion.result_str()) @orchestrator._cli_write_command( - 'orch mds add', + 'orch daemon add mds', "name=fs_name,type=CephString " "name=num,type=CephInt,req=false " "name=hosts,type=CephString,n=N,req=false", - 'Create an MDS service') + 'Start MDS daemon(s)') def _mds_add(self, fs_name, num=None, hosts=None): spec = orchestrator.ServiceSpec( fs_name, @@ -417,13 +417,12 @@ Usage: return HandleCommandResult(stdout=completion.result_str()) @orchestrator._cli_write_command( - 'orch rgw add', + 'orch daemon add rgw', 'name=realm_name,type=CephString ' 'name=zone_name,type=CephString ' 'name=num,type=CephInt,req=false ' "name=hosts,type=CephString,n=N,req=false", - 'Create an RGW service. A complete can be provided'\ - ' using <-i> to customize completelly the RGW service') + 'Start RGW daemon(s)') def _rgw_add(self, realm_name, zone_name, num=1, hosts=None, inbuf=None): usage = """ Usage: @@ -447,14 +446,14 @@ Usage: return HandleCommandResult(stdout=completion.result_str()) @orchestrator._cli_write_command( - 'orch nfs add', + 'orch daemon add nfs', "name=svc_arg,type=CephString " "name=pool,type=CephString " "name=namespace,type=CephString,req=false " 'name=num,type=CephInt,req=false ' 'name=hosts,type=CephString,n=N,req=false ' 'name=label,type=CephString,req=false', - 'Create an NFS service') + 'Start NFS daemon(s)') def _nfs_add(self, svc_arg, pool, namespace=None, num=None, label=None, hosts=[]): spec = orchestrator.NFSServiceSpec( svc_arg, -- 2.39.5