Merge pull request #196 from projectcalico/remove-tls-option

Fix incompatibility with etcd 3: don't set TLSv1 protocol in the client
jplana · Sep 1, 2016 · 0d0145f · 0d0145f
2 parents 152b809 + 80f9369
commit 0d0145f
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/src/etcd/client.py b/src/etcd/client.py
@@ -157,12 +157,6 @@ def uri(protocol, host, port):
         if self._read_timeout > 0:
             kw['timeout'] = self._read_timeout
 
-        if protocol == 'https':
-            # If we don't allow TLSv1, clients using older version of OpenSSL
-            # (<1.0) won't be able to connect.
-            _log.debug("HTTPS enabled.")
-            kw['ssl_version'] = ssl.PROTOCOL_TLSv1
-
         if cert:
             if isinstance(cert, tuple):
                 # Key and cert are separate