From 8bc34613bc229b3a54baa8020c7d9f02745e0d90 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Thu, 30 Apr 2015 19:09:22 -0700 Subject: [PATCH] Second try at fixing #1227 -- set e default value earlier --- lib/ansible/modules/cloud/docker/docker.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ansible/modules/cloud/docker/docker.py b/lib/ansible/modules/cloud/docker/docker.py index c7906bc4fdb..de89331defe 100644 --- a/lib/ansible/modules/cloud/docker/docker.py +++ b/lib/ansible/modules/cloud/docker/docker.py @@ -574,7 +574,7 @@ class DockerManager(object): else: 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) 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_ca_cert = dict(required=False, default=None, type='str'), 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), password = dict(), email = dict(),