From 0ad023a0ac0df12bceae8e048ca9982eeb5bb260 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Sat, 14 Mar 2015 22:59:17 -0700 Subject: [PATCH] When no use_tls is not specified and no tls parameters are given we need to not attempt tls. --- lib/ansible/modules/cloud/docker/docker.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/ansible/modules/cloud/docker/docker.py b/lib/ansible/modules/cloud/docker/docker.py index 3efd060a84..a730943fe5 100644 --- a/lib/ansible/modules/cloud/docker/docker.py +++ b/lib/ansible/modules/cloud/docker/docker.py @@ -593,12 +593,8 @@ class DockerManager(object): # or tls_ca_cert (which requests verifying the server with # a specific ca certificate) use_tls = module.params.get('use_tls') - if use_tls == 'no': - tls_config = None - else: - # If this stays True, we'll do encryption. If something overrides - # it, then we'll have a TLSConfig obj instead - tls_config = True + tls_config = None + if use_tls != 'no': params = {} # Setup client auth