Merge "Revert "Temp fix for api/keystone.py"" into stable/folsom

openstack · Jan 7, 2013 · 1d1fa85 · 1d1fa85
2 parents bda071a + 817d628
commit 1d1fa85
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/horizon/api/keystone.py b/horizon/api/keystone.py
@@ -112,13 +112,11 @@ def keystoneclient(request, admin=False):
         conn = getattr(request, cache_attr)
     else:
         endpoint = _get_endpoint_url(request, endpoint_type)
-        # FIXME(ttrifonov): temporarily commented,
-        # as the fix in Keystone is not merged yet
-        #insecure = getattr(settings, 'OPENSTACK_SSL_NO_VERIFY', False)
+        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