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

reviewable/pr18780/r1
Toshio Kuratomi 10 years ago
parent e51ea29d8f
commit 1fdf75d49d

@ -570,7 +570,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:
@ -1438,7 +1438,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(),

Loading…
Cancel
Save