Browse code

Merge "Keystone re-enable catalog caching"

Jenkins authored on 2016/09/08 09:59:33
Showing 1 changed files
... ...
@@ -248,9 +248,6 @@ function configure_keystone {
248 248
     iniset $KEYSTONE_CONF cache backend "oslo_cache.memcache_pool"
249 249
     iniset $KEYSTONE_CONF cache memcache_servers localhost:11211
250 250
 
251
-    # Do not cache the catalog backend due to https://bugs.launchpad.net/keystone/+bug/1537617
252
-    iniset $KEYSTONE_CONF catalog caching "False"
253
-
254 251
     iniset_rpc_backend keystone $KEYSTONE_CONF
255 252
 
256 253
     # Register SSL certificates if provided