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

handle inconsistencies in dockerd API

Browse source
This commit is contained in:
Nicolas Delaby 2016-02-23 14:10:10 +01:00
parent 8484815f58
commit 1e9f6ff324
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
salt/states/dockerng.py
View file

@ -159,10 +159,14 @@ 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)