cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #684 from bcoca/default_api_fix

Browse source 
moved defaulting to module constant to after when it is defined
This commit is contained in:
Brian Coca 2015-01-21 19:59:24 -05:00
commit b14d305611
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cloud/docker/docker.py
View file

@ -524,6 +524,8 @@ class DockerManager(object):
# connect to docker server
docker_url = urlparse(module.params.get('docker_url'))
docker_api_version = module.params.get('docker_api_version')
if not docker_api_version:
docker_api_version=docker.client.DEFAULT_DOCKER_API_VERSION
self.client = docker.Client(base_url=docker_url.geturl(), version=docker_api_version)
self.docker_py_versioninfo = get_docker_py_versioninfo()
@ -845,7 +847,7 @@ def main():
memory_limit = dict(default=0),
memory_swap = dict(default=0),
docker_url = dict(default='unix://var/run/docker.sock'),
docker_api_version = dict(default=docker.client.DEFAULT_DOCKER_API_VERSION),
docker_api_version = dict(),
username = dict(default=None),
password = dict(),
email = dict(),