From 5b4d7a21827531bf2fb1da8342e05074a877dc08 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
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.
---
cloud/docker/docker.py | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/cloud/docker/docker.py b/cloud/docker/docker.py
index 225022f05b9..6232ac474f1 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