summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2014-07-10 17:14:07 +0200
committerJoffrey F <joffrey@docker.com>2014-07-10 17:14:07 +0200
commit436a3b1ff9f874e3e4e84c88ee4604eab5f87994 (patch)
tree520722c55837ccb739477299a8d553cd5ab2c291 /docker
parent6f557ed73372aa5823393a53b079bf4cec7511b8 (diff)
downloaddocker-py-436a3b1ff9f874e3e4e84c88ee4604eab5f87994.tar.gz
server_cacert -> ca_cert
Diffstat (limited to 'docker')
-rw-r--r--docker/tls.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/tls.py b/docker/tls.py
index 61fa748..531f4d6 100644
--- a/docker/tls.py
+++ b/docker/tls.py
@@ -9,7 +9,7 @@ class TLSConfig(object):
verify = None
ssl_version = None
- def __init__(self, client_cert=None, server_cacert=None, verify=None,
+ def __init__(self, client_cert=None, ca_cert=None, verify=None,
ssl_version=None):
# Argument compatibility/mapping with
# http://docs.docker.com/examples/https/
@@ -45,15 +45,15 @@ class TLSConfig(object):
# Either set verify to True (public/default CA checks) or to the
# path of a CA Cert file.
if verify is not None:
- if not server_cacert:
+ if not ca_cert:
self.verify = verify
- elif os.path.isfile(server_cacert):
+ elif os.path.isfile(ca_cert):
if not verify:
raise errors.TLSParameterError(
'verify can not be False when a CA cert is'
' provided.'
)
- self.verify = server_cacert
+ self.verify = ca_cert
else:
raise errors.TLSParameterError(
'Invalid CA certificate provided for `tls_ca_cert`.'