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

Merge pull request #33659 from danslimmon/dockerng-dryrun-33632

Browse Source 
Added test mode to states.dockerng. Resolves #33632.
This commit is contained in:
Mike Place 2016-06-02 10:45:49 -07:00
commit d3253effe9
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
salt/states/dockerng.py
View File

@ -2256,6 +2256,10 @@ def volume_present(name, driver=None, driver_opts=None, force=False):
driver_opts = salt.utils.repack_dictlist(driver_opts)
volume = _find_volume(name)
if not volume:
if __opts__['test']:
ret['result'] = None
ret['comment'] = ('The volume \'{0}\' will be created'.format(name))
return ret
try:
ret['changes']['created'] = __salt__['dockerng.create_volume'](
name, driver=driver, driver_opts=driver_opts)
@ -2267,13 +2271,20 @@ def volume_present(name, driver=None, driver_opts=None, force=False):
result = True
ret['result'] = result
return ret
# volume exits, check if driver is the same.
# volume exists, check if driver is the same.
if driver is not None and volume['Driver'] != driver:
if not force:
ret['comment'] = "Driver for existing volume '{0}' ('{1}')" \
" does not match specified driver ('{2}')" \
" and force is False".format(
name, volume['Driver'], driver)
ret['result'] = None if __opts__['test'] else False
return ret
if __opts__['test']:
ret['result'] = None
ret['comment'] = "The volume '{0}' will be replaced with a" \
" new one using the driver '{1}'".format(
name, volume)
return ret
try:
ret['changes']['removed'] = __salt__['dockerng.remove_volume'](name)
@ -2294,7 +2305,7 @@ def volume_present(name, driver=None, driver_opts=None, force=False):
ret['result'] = result
return ret
ret['result'] = True
ret['result'] = None if __opts__['test'] else True
ret['comment'] = 'Volume \'{0}\' already exists.'.format(name)
return ret