From: Michael Fritch <mfritch@suse.com>
Date: Wed, 29 Apr 2020 21:02:34 +0000 (-0600)
Subject: mgr/orch: pass `inbuf` to add/apply (mds, rgw, nfs)
X-Git-Tag: v16.1.0~2394^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f285bbf5428d1233917ec66e68b30517bd437a76;p=ceph.git

mgr/orch: pass `inbuf` to add/apply (mds, rgw, nfs)

$ ceph orch apply mds a -i mds.yaml
TypeError: _apply_mds() got an unexpected keyword argument 'inbuf'

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 403af967794..24398b891f1 100644
--- a/src/pybind/mgr/orchestrator/module.py
+++ b/src/pybind/mgr/orchestrator/module.py
@@ -684,7 +684,7 @@ Usage:
         'name=fs_name,type=CephString '
         'name=placement,type=CephString,req=false',
         'Start MDS daemon(s)')
-    def _mds_add(self, fs_name, placement=None):
+    def _mds_add(self, fs_name, placement=None, inbuf=None):
         spec = ServiceSpec(
             'mds', fs_name,
             placement=PlacementSpec.from_string(placement),
@@ -763,7 +763,7 @@ Usage:
         "name=namespace,type=CephString,req=false "
         'name=placement,type=CephString,req=false',
         'Start NFS daemon(s)')
-    def _nfs_add(self, svc_arg, pool, namespace=None, placement=None):
+    def _nfs_add(self, svc_arg, pool, namespace=None, placement=None, inbuf=None):
         spec = NFSServiceSpec(
             svc_arg,
             pool=pool,
@@ -864,7 +864,10 @@ Usage:
         'name=placement,type=CephString,req=false '
         'name=unmanaged,type=CephBool,req=false',
         'Update the number of MDS instances for the given fs_name')
-    def _apply_mds(self, fs_name, placement=None, unmanaged=False):
+    def _apply_mds(self, fs_name,
+                   placement=None,
+                   unmanaged=False,
+                   inbuf=None):
         placement = PlacementSpec.from_string(placement)
         placement.validate()
         spec = ServiceSpec(
@@ -891,7 +894,8 @@ Usage:
                    port=None,
                    ssl=False,
                    placement=None,
-                   unmanaged=False):
+                   unmanaged=False,
+                   inbuf=None):
         spec = RGWSpec(
             rgw_realm=realm_name,
             rgw_zone=zone_name,
@@ -914,7 +918,10 @@ Usage:
         'name=placement,type=CephString,req=false '
         'name=unmanaged,type=CephBool,req=false',
         'Scale an NFS service')
-    def _apply_nfs(self, svc_id, pool, namespace=None, placement=None, unmanaged=False):
+    def _apply_nfs(self, svc_id, pool, namespace=None,
+                   placement=None,
+                   unmanaged=False,
+                   inbuf=None):
         spec = NFSServiceSpec(
             svc_id,
             pool=pool,