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

Fix dockerng _get_client() regression

Browse source 
This fixes a regression I introduced the other day in #40481 when I
backported auth fixes to 2016.3. I changed how the client was
instantiated and ended up passing an unsupported kwarg to the wrapped
function. This resolves that regression.
This commit is contained in:
Erik Johnson 2017-04-06 10:32:35 -05:00
parent 0918311330
commit 7f1ef72f83
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/modules/dockerng.py
View file

@ -548,7 +548,11 @@ def _get_docker_py_versioninfo():
def _get_client(**kwargs):
client_kwargs = {}
if 'client_timeout' in kwargs:
client_kwargs['timeout'] = kwargs.pop('client_timeout')
client_timeout = kwargs.pop('client_timeout')
if client_timeout is not None:
# Passing a kwarg of timeout=None causes problems in docker-py, so
# only set this kwarg if the value is not None.
client_kwargs['timeout'] = client_timeout
for key, val in (('base_url', 'docker.url'),
('version', 'docker.version')):
param = __salt__['config.get'](val, NOTSET)
@ -606,6 +610,8 @@ def _docker_client(wrapped):
'''
if 'docker.client' not in __context__:
__context__['docker.client'] = _get_client(**kwargs)
# Don't pass through client_timeout to the wrapped function
kwargs.pop('client_timeout', None)
return wrapped(*args, **salt.utils.clean_kwargs(**kwargs))
return wrapper