openstack/horizon
Code Issues Proposed changes

Merge "Added insecure SSL support to quantum api"

Browse Source
This commit is contained in:
Jenkins 2013-05-23 21:33:39 +00:00 committed by Gerrit Code Review
commit 24d9f140f5
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openstack_dashboard/api/quantum.py
View File

@ -23,6 +23,7 @@ from __future__ import absolute_import
import logging import logging
from django.conf import settings
from quantumclient.v2_0 import client as quantum_client from quantumclient.v2_0 import client as quantum_client
from django.utils.datastructures import SortedDict from django.utils.datastructures import SortedDict
@ -211,12 +212,14 @@ def get_ipver_str(ip_version):
def quantumclient(request): def quantumclient(request):
insecure = getattr(settings, 'OPENSTACK_SSL_NO_VERIFY', False)
LOG.debug('quantumclient connection created using token "%s" and url "%s"' LOG.debug('quantumclient connection created using token "%s" and url "%s"'
% (request.user.token.id, url_for(request, 'network'))) % (request.user.token.id, url_for(request, 'network')))
LOG.debug('user_id=%(user)s, tenant_id=%(tenant)s' % LOG.debug('user_id=%(user)s, tenant_id=%(tenant)s' %
{'user': request.user.id, 'tenant': request.user.tenant_id}) {'user': request.user.id, 'tenant': request.user.tenant_id})
c = quantum_client.Client(token=request.user.token.id, c = quantum_client.Client(token=request.user.token.id,
endpoint_url=url_for(request, 'network')) endpoint_url=url_for(request, 'network'),
insecure=insecure)
return c return c