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

Second try at fixing #1227 -- set e default value earlier

Browse source
This commit is contained in:
Toshio Kuratomi 2015-04-30 19:09:22 -07:00 committed by Matt Clay
parent 030858df67
commit 8bc34613bc
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/cloud/docker/docker.py
View file

@ -574,7 +574,7 @@ class DockerManager(object):
else: else:
docker_url = 'unix://var/run/docker.sock' docker_url = 'unix://var/run/docker.sock'
docker_api_version = module.params.get('docker_api_version', DEFAULT_DOCKER_API_VERSION) docker_api_version = module.params.get('docker_api_version')
tls_client_cert = module.params.get('tls_client_cert', None) tls_client_cert = module.params.get('tls_client_cert', None)
if not tls_client_cert and env_cert_path: if not tls_client_cert and env_cert_path:
@ -1454,7 +1454,7 @@ def main():
tls_client_key = dict(required=False, default=None, type='str'), tls_client_key = dict(required=False, default=None, type='str'),
tls_ca_cert = dict(required=False, default=None, type='str'), tls_ca_cert = dict(required=False, default=None, type='str'),
tls_hostname = dict(required=False, type='str', default=None), tls_hostname = dict(required=False, type='str', default=None),
docker_api_version = dict(), docker_api_version = dict(required=False, default=DEFAULT_DOCKER_API_VERSION, type='str'),
username = dict(default=None), username = dict(default=None),
password = dict(), password = dict(),
email = dict(), email = dict(),