mgr/orchestrator: add count, hosts args to 'mds add'

Rook already uses the count; the hosts hint is not relevant.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/pybind/mgr/orchestrator.py b/src/pybind/mgr/orchestrator.py
index 79764720cb2a37e061db97b61ceda7958cc7737c..86d375046d8ad21ac421ffd0bb98a5e0d137730c 100644 (file)
--- a/src/pybind/mgr/orchestrator.py
+++ b/src/pybind/mgr/orchestrator.py
@@ -564,8 +564,9 @@ class PlacementSpec(object):
     """
     For APIs that need to specify a node subset
     """
-    def __init__(self):
-        self.label = None
+    def __init__(self, label=None, nodes=[]):
+        self.label = label
+        self.nodes = nodes
 
 
 def handle_type_error(method):

diff --git a/src/pybind/mgr/orchestrator_cli/module.py b/src/pybind/mgr/orchestrator_cli/module.py
index a73ba2a836389deb4afac7d047198b741d08254b..d65cfbf7a6292b5b3b682c0dd3468334bed19a1b 100644 (file)
--- a/src/pybind/mgr/orchestrator_cli/module.py
+++ b/src/pybind/mgr/orchestrator_cli/module.py
@@ -237,10 +237,15 @@ Usage:
         return HandleCommandResult(stdout=completion.result_str())
 
     @_write_cli('orchestrator mds add',
-                "name=svc_arg,type=CephString",
+                "name=svc_arg,type=CephString "
+                "name=num,type=CephInt,req=false "
+                "name=hosts,type=CephString,n=N,req=false",
                 'Create an MDS service')
-    def _mds_add(self, svc_arg):
-        spec = orchestrator.StatelessServiceSpec(svc_arg)
+    def _mds_add(self, svc_arg, num, hosts):
+        spec = orchestrator.StatelessServiceSpec(
+            svc_arg,
+            placement=orchestrator.PlacementSpec(nodes=hosts),
+            count=num or 1)
         completion = self.add_mds(spec)
         self._orchestrator_wait([completion])
         orchestrator.raise_if_exception(completion)