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 #31432 from ticosax/hotfix-docker-1.10.2

Browse source 
[dockerng] Hotfix docker 1.10.2
This commit is contained in:
Mike Place 2016-02-23 08:39:04 -07:00
commit 05c12b9ba1
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
salt/states/dockerng.py
View file

@ -159,17 +159,21 @@ def _compare(actual, create_kwargs, defaults_from_image):
else:
actual_data = _get(conf_path)
if actual_data is NOTSET:
if item == 'network_disabled':
# XXX hack ! docker daemon doesn't
# return Config:NetworkDisabled from inspect command.
# therefore the path is correct.
if item in ('network_disabled', # dockerd 1.9.1
'lxc_conf', # dockerd 1.10.2
):
# XXX hack !
# Depending of docker daemon version,
# the inspect command doesn't always
# return all expected values.
# TODO consider removing NOTSET checking.
actual_data = config.get('default')
else:
_api_mismatch(item)
log.trace('dockerng.running ({0}): desired value: {1}'
.format(item, data))
.format(item, data))
log.trace('dockerng.running ({0}): actual value: {1}'
.format(item, actual_data))
.format(item, actual_data))
# 'create' comparison params
if item == 'detach':
@ -177,7 +181,7 @@ def _compare(actual, create_kwargs, defaults_from_image):
# then detach is True
actual_detach = all(x is False for x in actual_data)
log.trace('dockerng.running ({0}): munged actual value: {1}'
.format(item, actual_detach))
.format(item, actual_detach))
if actual_detach != data:
ret.update({item: {'old': actual_detach, 'new': data}})
continue