Merge "Add SSL support for freezer-web-ui"

This commit is contained in:
Jenkins 2016-03-04 09:20:25 +00:00 committed by Gerrit Code Review
commit c879dc6016
1 changed files with 6 additions and 1 deletions

View File

@ -35,11 +35,16 @@ def client(request):
ks_version = getattr(settings,
'OPENSTACK_API_VERSIONS', {}).get('identity', 2.0)
insecure = getattr(settings, 'OPENSTACK_SSL_NO_VERIFY', False)
cacert = getattr(settings, 'OPENSTACK_SSL_CACERT', None)
credentials = {
'token': request.user.token.id,
'auth_url': getattr(settings, 'OPENSTACK_KEYSTONE_URL'),
'endpoint': api_url,
'version': ks_version
'version': ks_version,
'cacert': cacert,
'insecure': insecure
}
if ks_version == 3: