@@ -218,6 +218,14 @@ function configure_keystone {

     iniset $KEYSTONE_CONF role driver "$KEYSTONE_ROLE_BACKEND"

     iniset $KEYSTONE_CONF resource driver "$KEYSTONE_RESOURCE_BACKEND"

+    # Enable caching

+    iniset $KEYSTONE_CONF cache enabled "True"

+    iniset $KEYSTONE_CONF cache backend "oslo_cache.memcache_pool"

+    iniset $KEYSTONE_CONF cache memcache_servers $SERVICE_HOST:11211

+

+    # Do not cache the catalog backend due to https://bugs.launchpad.net/keystone/+bug/1537617

+    iniset $KEYSTONE_CONF catalog caching "False"

+

     iniset_rpc_backend keystone $KEYSTONE_CONF

     # Register SSL certificates if provided