From 901ce4914d1c1811e99e30e44db489b13ae1b452 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 13 Dec 2019 16:30:29 -0600 Subject: [PATCH] mgr/orchestrator: make hosts and label args consistent - hosts is always n=N; labels is not - hosts always before labels Signed-off-by: Sage Weil --- src/pybind/mgr/orchestrator_cli/module.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pybind/mgr/orchestrator_cli/module.py b/src/pybind/mgr/orchestrator_cli/module.py index 9dd74a4c98248..5949ed910c015 100644 --- a/src/pybind/mgr/orchestrator_cli/module.py +++ b/src/pybind/mgr/orchestrator_cli/module.py @@ -393,8 +393,8 @@ Usage: @orchestrator._cli_write_command( 'orchestrator rbd-mirror update', "name=num,type=CephInt,req=false " - "name=label,type=CephString,req=false " - "name=hosts,type=CephString,n=N,req=false", + "name=hosts,type=CephString,n=N,req=false " + "name=label,type=CephString,req=false", 'Update the number of rbd-mirror instances') def _rbd_mirror_update(self, num, label=None, hosts=[]): spec = orchestrator.StatelessServiceSpec( @@ -434,8 +434,8 @@ Usage: 'orchestrator mds update', "name=fs_name,type=CephString " "name=num,type=CephInt,req=false " - "name=label,type=CephString,req=false", "name=hosts,type=CephString,n=N,req=false " + "name=label,type=CephString,req=false", 'Update the number of MDS instances for the given fs_name') def _mds_update(self, fs_name, num=None, label=None, hosts=[]): placement = orchestrator.PlacementSpec(label=label, count=num, nodes=hosts) @@ -495,8 +495,8 @@ Usage: 'name=zone_name,type=CephString ' 'name=realm_name,type=CephString ' 'name=num,type=CephInt,req=false ' - 'name=label,type=CephString,req=false ' - 'name=hosts,type=CephString,n=N,req=false', + 'name=hosts,type=CephString,n=N,req=false ' + 'name=label,type=CephString,req=false', 'Update the number of RGW instances for the given zone') def _rgw_update(self, zone_name, realm_name, num=None, label=None, hosts=[]): spec = orchestrator.RGWSpec( @@ -583,7 +583,7 @@ Usage: 'orchestrator mgr update', "name=num,type=CephInt,req=false " "name=hosts,type=CephString,n=N,req=false " - "name=label,type=CephString,n=N,req=false", + "name=label,type=CephString,req=false", 'Update the number of manager instances') def _update_mgrs(self, num=None, hosts=[], label=None): @@ -601,7 +601,7 @@ Usage: 'orchestrator mon update', "name=num,type=CephInt,req=false " "name=hosts,type=CephString,n=N,req=false " - "name=label,type=CephString,n=N,req=false", + "name=label,type=CephString,req=false", 'Update the number of monitor instances') def _update_mons(self, num=None, hosts=[], label=None): -- 2.39.5