Merge PR ceph#30185 into master

* refs/pull/30185/head: mgr/volumes: drop unnecessary size Reviewed-by: Ramana Raja <[email protected]> Reviewed-by: Patrick Donnelly <[email protected]>
zmc · Sep 13, 2019 · 05d95c2 · 05d95c2
2 parents b74f92c + 6c4154b
commit 05d95c2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/pybind/mgr/volumes/fs/volume.py b/src/pybind/mgr/volumes/fs/volume.py
@@ -247,7 +247,7 @@ def create_mds(self, fs_name):
 
     ### volume operations -- create, rm, ls
 
-    def create_volume(self, volname, size=None):
+    def create_volume(self, volname):
         """
         create volume  (pool, filesystem and mds)
         """

diff --git a/src/pybind/mgr/volumes/module.py b/src/pybind/mgr/volumes/module.py
@@ -31,8 +31,7 @@ class Module(orchestrator.OrchestratorClientMixin, MgrModule):
         },
         {
             'cmd': 'fs volume create '
-                   'name=name,type=CephString '
-                   'name=size,type=CephString,req=false ',
+                   'name=name,type=CephString ',
             'desc': "Create a CephFS volume",
             'perm': 'rw'
         },
@@ -191,9 +190,7 @@ def _cmd_fs_volume_create(self, inbuf, cmd):
         # TODO: validate name against any rules for pool/fs names
         # (...are there any?)
         vol_id = cmd['name']
-        size = cmd.get('size', None)
-
-        return self.vc.create_volume(vol_id, size)
+        return self.vc.create_volume(vol_id)
 
     def _cmd_fs_volume_rm(self, inbuf, cmd):
         vol_name = cmd['vol_name']