From f2309df0989d41191ab74fdb0e6bbd4e3a6cce75 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 23 Jan 2014 14:14:38 +0100 Subject: [PATCH] Reference dogpile.cache.memcached backend properly It is dogpile.cache.memcached, not dogpile.cache.memcache see http://dogpilecache.readthedocs.org/en/latest/api.html?highlight=memcache#module-dogpile.cache.backends.memcached Change-Id: Ia2aded1be82453b87a7734441537a5976385616e --- doc/source/configuration.rst | 2 +- etc/keystone.conf.sample | 2 +- keystone/common/kvs/backends/memcached.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index 484dbff8d4..e95e8bbb40 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -242,7 +242,7 @@ behavior is that subsystem caching is enabled, but the global toggle is set to d * ``enabled`` - enables/disables caching across all of keystone * ``debug_cache_backend`` - enables more in-depth logging from the cache backend (get, set, delete, etc) -* ``backend`` - the caching backend module to use e.g. ``dogpile.cache.memcache`` +* ``backend`` - the caching backend module to use e.g. ``dogpile.cache.memcached`` .. NOTE:: A given ``backend`` must be registered with ``dogpile.cache`` before it diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample index ce77397d50..909e6c98d7 100644 --- a/etc/keystone.conf.sample +++ b/etc/keystone.conf.sample @@ -292,7 +292,7 @@ # expiration_time = 600 # Dogpile.cache backend module. It is recommended that Memcache -# (dogpile.cache.memcache) or Redis (dogpile.cache.redis) be used in production +# (dogpile.cache.memcached) or Redis (dogpile.cache.redis) be used in production # deployments. Small workloads (single process) like devstack can use the # dogpile.cache.memory backend. # backend = keystone.common.cache.noop diff --git a/keystone/common/kvs/backends/memcached.py b/keystone/common/kvs/backends/memcached.py index 8bf27392d6..117e72bce9 100644 --- a/keystone/common/kvs/backends/memcached.py +++ b/keystone/common/kvs/backends/memcached.py @@ -76,7 +76,7 @@ class MemcachedLock(object): class MemcachedBackend(manager.Manager): - """Pivot point to leverage the various dogpile.cache memcache backends. + """Pivot point to leverage the various dogpile.cache memcached backends. To specify a specific dogpile.cache memcached backend, pass the region backend argument `dogpile_memcache_backend` set to one of the known dogpile