From d0403e9318660e6cfa42c02c6be3b2b800548593 Mon Sep 17 00:00:00 2001 From: Tihomir Trifonov Date: Thu, 26 Jul 2012 12:41:41 +0300 Subject: [PATCH] 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 --- horizon/api/keystone.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/horizon/api/keystone.py b/horizon/api/keystone.py index f612bff54..712b4b8ae 100644 --- a/horizon/api/keystone.py +++ b/horizon/api/keystone.py @@ -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