saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #24899 from rallytime/bp-24847

Browse source 
Back-port #24847 to 2015.5
This commit is contained in:
Justin Findlay 2015-06-24 09:09:01 -06:00
commit a546e8e326
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/lxc.py
View file

@ -1866,7 +1866,7 @@ def create(name,
lvname = select('lvname')
fstype = select('fstype')
size = select('size', '1G')
if backing in ('dir', 'overlayfs', 'btrfs'):
if backing in ('dir', 'overlayfs', 'btrfs', 'zfs'):
fstype = None
size = None
# some backends wont support some parameters