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

salt.module.zpool - fix bug with properties on/off being parsed as true/false

Browse Source
This commit is contained in:
Jorge Schrauwen 2016-07-21 00:28:23 +02:00
parent dd64494a19
commit a5a98845c7
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/modules/zpool.py
View File

@ -671,10 +671,13 @@ def create(zpool, *vdevs, **kwargs):
if properties: # create "-o property=value" pairs if properties: # create "-o property=value" pairs
optlist = [] optlist = []
for prop in properties: for prop in properties:
if ' ' in properties[prop]: if isinstance(properties[prop], bool):
value = "'{0}'".format(properties[prop]) value = 'on' if properties[prop] else 'off'
else: else:
value = properties[prop] if ' ' in properties[prop]:
value = "'{0}'".format(properties[prop])
else:
value = properties[prop]
optlist.append('-o {0}={1}'.format(prop, value)) optlist.append('-o {0}={1}'.format(prop, value))
opts = ' '.join(optlist) opts = ' '.join(optlist)
cmd = '{0} {1}'.format(cmd, opts) cmd = '{0} {1}'.format(cmd, opts)