Temp fix for api/keystone.py

as the needed change is not merged yet in keystone...

This is the related change:
   https://review.openstack.org/#/c/9582

As I see there are some arguments around this change.
So either this or the related change should be merged...

Change-Id: I4a18ccf0aa190dc5632ec28b398784b04cf448be
This commit is contained in:
Tihomir Trifonov 2012-07-26 12:41:41 +03:00
parent fd56b24491
commit d0403e9318

View File

@ -112,11 +112,13 @@ def keystoneclient(request, admin=False):
conn = getattr(request, cache_attr)
else:
endpoint = _get_endpoint_url(request, endpoint_type)
insecure = getattr(settings, 'OPENSTACK_SSL_NO_VERIFY', False)
# FIXME(ttrifonov): temporarily commented,
# as the fix in Keystone is not merged yet
#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,
insecure=insecure)
endpoint=endpoint)
# insecure=insecure)
setattr(request, cache_attr, conn)
return conn