openstack
/
horizon
Code Issues Proposed changes

Merge "Fix a TypeError when working in a Folsom env."

This commit is contained in:
Jenkins 2013-02-27 19:07:41 +00:00 committed by Gerrit Code Review
parent 986182b327 109ccb1ad9
commit f8d7cece7b
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
openstack_dashboard/api/keystone.py
View File

@ -21,6 +21,7 @@
import logging
import urlparse
from pkg_resources import get_distribution
from django.conf import settings
from django.utils.translation import ugettext_lazy as _
@ -115,10 +116,18 @@ def keystoneclient(request, admin=False):
endpoint = _get_endpoint_url(request, endpoint_type)
insecure = getattr(settings, 'OPENSTACK_SSL_NO_VERIFY', False)
LOG.debug("Creating a new keystoneclient connection to %s." % endpoint)
conn = keystone_client.Client(
token=user.token.id, endpoint=endpoint,
original_ip=request.environ.get('REMOTE_ADDR', ''),
insecure=insecure)
# TODO: to be removed in H release
kcversion = get_distribution("python-keystoneclient").version
if kcversion >= '0.2.0':
conn = keystone_client.Client(
token=user.token.id, endpoint=endpoint,
original_ip=request.environ.get('REMOTE_ADDR', ''),
insecure=insecure)
else:
conn = keystone_client.Client(
token=user.token.id, endpoint=endpoint,
insecure=insecure)
setattr(request, cache_attr, conn)
return conn