From: Jos Collin <jcollin@redhat.com>
Date: Thu, 5 Sep 2019 13:48:23 +0000 (+0530)
Subject: mgr/volumes: drop unnecessary size
X-Git-Tag: v14.2.5~258^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0f69ce217e841a62abb98f89456fe74c7b4fd2a7;p=ceph.git

mgr/volumes: drop unnecessary size

Fixes: https://tracker.ceph.com/issues/41752
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit 6c4154b1bbdb9deeb0420a604def43e9f52aa4a0)
---

diff --git a/src/pybind/mgr/volumes/fs/volume.py b/src/pybind/mgr/volumes/fs/volume.py
index 8e32a233b4f78..5c7f758894ead 100644
--- a/src/pybind/mgr/volumes/fs/volume.py
+++ b/src/pybind/mgr/volumes/fs/volume.py
@@ -248,7 +248,7 @@ class VolumeClient(object):
 
     ### 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
index 5d63fc56d2164..3d7260577f596 100644
--- 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 @@ class Module(orchestrator.OrchestratorClientMixin, MgrModule):
         # 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']