valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'bp-14324' into 2014.7

Browse Source
This commit is contained in:
Thomas S Hatch 2014-07-17 16:03:27 -06:00
commit b378dbbe14
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/lxc.py
View File

@ -1098,11 +1098,11 @@ def create(name, config=None, profile=None, options=None, **kwargs):
fstype = select('fstype')
size = select('size', '1G')
image = select('image')
if backing in ['dir', 'overlayfs']:
if backing in ['dir', 'overlayfs', 'btrfs']:
fstype = None
size = None
# some backends wont support some parameters
if backing in ['aufs', 'dir', 'overlayfs']:
if backing in ['aufs', 'dir', 'overlayfs', 'btrfs']:
lvname = vgname = None
if image: