Merge "client looking at wrong cacert argument name"

This commit is contained in:
Jenkins
2014-01-15 11:48:01 +00:00
committed by Gerrit Code Review

View File

@@ -90,7 +90,7 @@ def get_client(api_version, **kwargs):
'token': token, 'token': token,
'insecure': kwargs.get('insecure'), 'insecure': kwargs.get('insecure'),
'timeout': kwargs.get('timeout'), 'timeout': kwargs.get('timeout'),
'cacert': kwargs.get('cacert'), 'cacert': kwargs.get('os_cacert'),
'cert_file': kwargs.get('cert_file'), 'cert_file': kwargs.get('cert_file'),
'key_file': kwargs.get('key_file'), 'key_file': kwargs.get('key_file'),
} }