Repository: libcloud
Updated Branches:
  refs/heads/trunk 873f776cd -> 1fdb4df1c


in case of ca_cert has been already set by libcloud.security.CA_CERT_PATH


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/2b3c2e0a
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/2b3c2e0a
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/2b3c2e0a

Branch: refs/heads/trunk
Commit: 2b3c2e0aefa6a5b4e6f52d61e1b0153adf8eb99d
Parents: 03f5d80
Author: johnnyWalnut <ikaryd...@gmail.com>
Authored: Fri Jun 2 15:29:32 2017 +0200
Committer: Anthony Shaw <anthonys...@apache.org>
Committed: Fri Aug 11 14:43:39 2017 +1000

----------------------------------------------------------------------
 libcloud/container/drivers/docker.py | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/2b3c2e0a/libcloud/container/drivers/docker.py
----------------------------------------------------------------------
diff --git a/libcloud/container/drivers/docker.py 
b/libcloud/container/drivers/docker.py
index b69b1ee..37c8eb2 100644
--- a/libcloud/container/drivers/docker.py
+++ b/libcloud/container/drivers/docker.py
@@ -240,6 +240,9 @@ class DockerContainerDriver(ContainerDriver):
 
         if ca_cert:
             self.connection.connection.ca_cert = ca_cert
+        elif hasattr(self.connection.connection, 'ca_cert'):
+            # already set by libcloud.security.CA_CERTS_PATH
+            pass
         else:
             # do not verify SSL certificate
             self.connection.connection.ca_cert = False

Reply via email to