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

Let docker-py auto detect version if not defined by user

Browse Source 
Docker-py will auto detect docker version incase version 'auto' is used.
Reference: docker/docker-py#673
This commit is contained in:
Carl Loa Odin 2015-08-10 10:10:50 +02:00
parent 7c4027eedc
commit 3f1f2d195d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/modules/dockerio.py
View File

@ -252,7 +252,7 @@ def _valid(m, id_=NOTSET, comment=VALID_RESPONSE, out=None):
return _set_status(m, status=True, id_=id_, comment=comment, out=out)
def _get_client(version=None, timeout=None):
def _get_client(timeout=None):
'''
Get a connection to a docker API (socket or URL)
based on config.get mechanism (pillar -> grains)
@ -279,14 +279,16 @@ def _get_client(version=None, timeout=None):
# only if defined by user.
kwargs['timeout'] = timeout
if 'version' not in kwargs:
# Let docker-py auto detect docker version incase
# it's not defined by user.
kwargs['version'] = 'auto'
if 'base_url' not in kwargs and 'DOCKER_HOST' in os.environ:
# Check if the DOCKER_HOST environment variable has been set
kwargs['base_url'] = os.environ.get('DOCKER_HOST')
client = docker.Client(**kwargs)
if not version:
# set version that match docker daemon
client._version = client.version()['ApiVersion']
# try to authenticate the client using credentials
# found in pillars