RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-20 17:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #30185 into master

Browse Source 
* refs/pull/30185/head:
	mgr/volumes: drop unnecessary size

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Patrick Donnelly 2019-09-13 12:02:20 -07:00
commit 05d95c249d
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pybind/mgr/volumes/fs/volume.py
View File

@ -247,7 +247,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)
"""

7
src/pybind/mgr/volumes/module.py
View File

@ -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']