summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToshio Kuratomi <toshio@fedoraproject.org>2015-03-14 22:59:17 -0700
committerToshio Kuratomi <toshio@fedoraproject.org>2015-03-14 22:59:17 -0700
commit5b4d7a21827531bf2fb1da8342e05074a877dc08 (patch)
tree24461870750ff6e79a66072a63e5df9ad601801a
parente44ee190d2771c470f9e21633214dea9db3f4f1a (diff)
downloadansible-modules-core-docker-tls-none.tar.gz
When no use_tls is not specified and no tls parameters are given we need to not attempt tls.docker-tls-none
-rw-r--r--cloud/docker/docker.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/cloud/docker/docker.py b/cloud/docker/docker.py
index 225022f0..6232ac47 100644
--- a/cloud/docker/docker.py
+++ b/cloud/docker/docker.py
@@ -589,12 +589,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