remove ca_cert argument from docker driver

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

Branch: refs/heads/trunk
Commit: 3c6b7eba8b34007b2dc1e8f5726beabdd207dc78
Parents: 6fea2fa
Author: Anthony Shaw <anthonys...@apache.org>
Authored: Fri Aug 11 14:52:17 2017 +1000
Committer: Anthony Shaw <anthonys...@apache.org>
Committed: Fri Aug 11 14:52:17 2017 +1000

----------------------------------------------------------------------
 libcloud/container/drivers/docker.py | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/3c6b7eba/libcloud/container/drivers/docker.py
----------------------------------------------------------------------
diff --git a/libcloud/container/drivers/docker.py 
b/libcloud/container/drivers/docker.py
index caf7e15..dc9cabd 100644
--- a/libcloud/container/drivers/docker.py
+++ b/libcloud/container/drivers/docker.py
@@ -121,7 +121,7 @@ class DockertlsConnection(KeyCertificateConnection):
 
     def __init__(self, key, secret, secure=True,
                  host='localhost',
-                 port=4243, ca_cert='', key_file='', cert_file='', **kwargs):
+                 port=4243, key_file='', cert_file='', **kwargs):
 
         super(DockertlsConnection, self).__init__(key_file=key_file,
                                                   cert_file=cert_file,
@@ -181,7 +181,7 @@ class DockerContainerDriver(ContainerDriver):
     version = '1.24'
 
     def __init__(self, key='', secret='', secure=False, host='localhost',
-                 port=4243, key_file=None, cert_file=None, ca_cert=None):
+                 port=4243, key_file=None, cert_file=None):
         """
         :param    key: API key or username to used (required)
         :type     key: ``str``
@@ -239,15 +239,6 @@ class DockerContainerDriver(ContainerDriver):
                     'Needs both private key file and '
                     'certificate file for tls authentication')
 
-        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
-
         self.connection.secure = secure
         self.connection.host = host
         self.connection.port = port

Reply via email to