From: Michael Fritch <mfritch@suse.com>
Date: Thu, 4 Jun 2020 16:39:51 +0000 (-0600)
Subject: mgr/orch: use keyword rather than positional arg
X-Git-Tag: v16.1.0~2127^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=248888dab4bc3b173210c48fbdba031091fd3f19;p=ceph.git

mgr/orch: use keyword rather than positional arg

use keyword `service_id` from the orch cli

Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py
index 0518941c6e0f..7947cdb408c4 100644
--- a/src/pybind/mgr/orchestrator/module.py
+++ b/src/pybind/mgr/orchestrator/module.py
@@ -818,7 +818,8 @@ Usage:
             raise OrchestratorValidationError('unrecognized command -i; -h or --help for usage')
 
         spec = ServiceSpec(
-            'mds', fs_name,
+            service_type='mds',
+            service_id=fs_name,
             placement=PlacementSpec.from_string(placement),
         )
 
@@ -878,7 +879,7 @@ Usage:
             raise OrchestratorValidationError('unrecognized command -i; -h or --help for usage')
 
         spec = NFSServiceSpec(
-            svc_id,
+            service_id=svc_id,
             pool=pool,
             namespace=namespace,
             placement=PlacementSpec.from_string(placement),
@@ -1023,7 +1024,8 @@ Usage:
             raise OrchestratorValidationError('unrecognized command -i; -h or --help for usage')
 
         spec = ServiceSpec(
-            'mds', fs_name,
+            service_type='mds',
+            service_id=fs_name,
             placement=PlacementSpec.from_string(placement),
             unmanaged=unmanaged)
 
@@ -1088,7 +1090,7 @@ Usage:
             raise OrchestratorValidationError('unrecognized command -i; -h or --help for usage')
 
         spec = NFSServiceSpec(
-            svc_id,
+            service_id=svc_id,
             pool=pool,
             namespace=namespace,
             placement=PlacementSpec.from_string(placement),