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

_api_mismatch was a good idea

Browse Source 
But impractical since dockerd doesn't necessarily return all configuration items.
This commit is contained in:
Nicolas Delaby 2016-02-24 16:34:45 +01:00
parent 8f6c4be618
commit 5630401889
1 changed files with 7 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
salt/states/dockerng.py
View File

@ -62,8 +62,6 @@ log = logging.getLogger(__name__) # pylint: disable=invalid-name
# Define the module's virtual name
__virtualname__ = 'dockerng'
NOTSET = object()
def __virtual__():
'''
@ -89,17 +87,6 @@ def _format_comments(comments):
return ret
def _api_mismatch(param):
'''
Raise an exception if a config value can't be found at the expected
location in a call to dockerng.inspect_container
'''
raise CommandExecutionError(
'Unable to compare configuration for the \'{0}\' parameter. This may '
'be due to a change in the Docker API'.format(param)
)
def _prep_input(kwargs):
'''
Repack (if necessary) data that should be in a dict but is easier to
@ -126,13 +113,12 @@ def _compare(actual, create_kwargs, defaults_from_image):
Compare the desired configuration against the actual configuration returned
by dockerng.inspect_container
'''
_get = lambda path: (
salt.utils.traverse_dict(actual, path, NOTSET, delimiter=':')
)
_image_get = lambda path: (
salt.utils.traverse_dict(defaults_from_image, path, NOTSET,
def _get(path, default=None):
return salt.utils.traverse_dict(actual, path, default, delimiter=':')
def _image_get(path):
return salt.utils.traverse_dict(defaults_from_image, path, None,
delimiter=':')
)
ret = {}
for item, config in six.iteritems(VALID_CREATE_OPTS):
try:
@ -145,31 +131,13 @@ def _compare(actual, create_kwargs, defaults_from_image):
data = _get(config['path'])
else:
data = config.get('default')
else:
if data is NOTSET:
_api_mismatch(item)
log.trace('dockerng.running: comparing ' + item)
conf_path = config['path']
if isinstance(conf_path, tuple):
actual_data = [_get(x) for x in conf_path]
for val in actual_data:
if val is NOTSET:
_api_mismatch(item)
else:
actual_data = _get(conf_path)
if actual_data is NOTSET:
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)
actual_data = _get(conf_path, default=config.get('default'))
log.trace('dockerng.running ({0}): desired value: {1}'
.format(item, data))
log.trace('dockerng.running ({0}): actual value: {1}'