When no use_tls is not specified and no tls parameters are given we need to not attempt tls.

pull/18777/head
Toshio Kuratomi 10 years ago committed by Matt Clay
parent eeb867daf0
commit 0ad023a0ac

@ -593,12 +593,8 @@ class DockerManager(object):
# or tls_ca_cert (which requests verifying the server with # or tls_ca_cert (which requests verifying the server with
# a specific ca certificate) # a specific ca certificate)
use_tls = module.params.get('use_tls') use_tls = module.params.get('use_tls')
if use_tls == 'no':
tls_config = None tls_config = None
else: if use_tls != 'no':
# If this stays True, we'll do encryption. If something overrides
# it, then we'll have a TLSConfig obj instead
tls_config = True
params = {} params = {}
# Setup client auth # Setup client auth

Loading…
Cancel
Save