openstack
/
keystone
Code Issues Proposed changes

Follow-on of memcache token persistence removal 

In commit I4b8b88409abe8eea8f0a075aebbe9c569367c454, the memcache
and memcache_pool token persistence drivers were removed. However
the documentation still contains references to these drivers.

bp removed-as-of-ocata

Change-Id: I56f05c976c69c98a3bf3bd325fc3239cb9618a57
This commit is contained in:
Eric Brown 2016-10-17 17:15:53 -07:00
parent dbee24fde1
commit bef14444e2
3 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
doc/source/configuration.rst
View File

@ -413,26 +413,17 @@ Token Persistence Driver
Keystone supports customizable token persistence drivers. These can be
specified in the ``[token]`` section of the configuration file. Keystone
provides three non-test persistence backends. These can be set with the
provides two non-test persistence backends. These can be set with the
``[token] driver`` configuration option.
The drivers keystone provides are:
* ``memcache_pool`` - The pooled memcached token persistence engine. This
backend supports the concept of pooled memcache client object (allowing for
the re-use of the client objects). This backend has a number of extra tunable
options in the ``[memcache]`` section of the config. Implemented by
:class:`keystone.token.persistence.backends.memcache_pool.Token`
* ``kvs`` - The key-value store token persistence engine. Implemented by
:class:`keystone.token.persistence.backends.kvs.Token`
* ``sql`` - The SQL-based (default) token persistence engine. Implemented by
:class:`keystone.token.persistence.backends.sql.Token`
* ``memcache`` - The memcached based token persistence backend. This backend
relies on ``dogpile.cache`` and stores the token data in a set of memcached
servers. The servers URLs are specified in the ``[memcache] servers``
configuration option in the keystone config. Implemented by
:class:`keystone.token.persistence.backends.memcache.Token`
Token Provider
--------------

17
keystone/conf/memcache.py
View File

@ -34,8 +34,7 @@ dead_retry = cfg.IntOpt(
default=5 * 60,
help=utils.fmt("""
Number of seconds memcached server is considered dead before it is tried again.
This is used by the key value store system (including, the `memcache` and
`memcache_pool` options for the `[token] driver` persistence backend).
This is used by the key value store system.
"""))
socket_timeout = cfg.IntOpt(
@ -43,8 +42,7 @@ socket_timeout = cfg.IntOpt(
default=3,
help=utils.fmt("""
Timeout in seconds for every call to a server. This is used by the key value
store system (including, the `memcache` and `memcache_pool` options for the
`[token] driver` persistence backend).
store system.
"""))
pool_maxsize = cfg.IntOpt(
@ -52,8 +50,7 @@ pool_maxsize = cfg.IntOpt(
default=10,
help=utils.fmt("""
Max total number of open connections to every memcached server. This is used by
the key value store system (including, the `memcache` and `memcache_pool`
options for the `[token] driver` persistence backend).
the key value store system.
"""))
pool_unused_timeout = cfg.IntOpt(
@ -61,9 +58,7 @@ pool_unused_timeout = cfg.IntOpt(
default=60,
help=utils.fmt("""
Number of seconds a connection to memcached is held unused in the pool before
it is closed. This is used by the key value store system (including, the
`memcache` and `memcache_pool` options for the `[token] driver` persistence
backend).
it is closed. This is used by the key value store system.
"""))
pool_connection_get_timeout = cfg.IntOpt(
@ -71,9 +66,7 @@ pool_connection_get_timeout = cfg.IntOpt(
default=10,
help=utils.fmt("""
Number of seconds that an operation will wait to get a memcache client
connection. This is used by the key value store system (including, the
`memcache` and `memcache_pool` options for the `[token] driver` persistence
backend).
connection. This is used by the key value store system.
"""))

12
keystone/conf/token.py
View File

@ -81,13 +81,11 @@ driver = cfg.StrOpt(
default='sql',
help=utils.fmt("""
Entry point for the token persistence backend driver in the
`keystone.token.persistence` namespace. Keystone provides `kvs`, `memcache`,
`memcache_pool`, and `sql` drivers. The `kvs` backend depends on the
configuration in the `[kvs]` section. The `memcache` and `memcache_pool`
options depend on the configuration in the `[memcache]` section. The `sql`
option (default) depends on the options in your `[database]` section. If you're
using the `fernet` `[token] provider`, this backend will not be utilized to
persist tokens at all.
`keystone.token.persistence` namespace. Keystone provides `kvs` and `sql`
drivers. The `kvs` backend depends on the configuration in the `[kvs]` section.
The `sql` option (default) depends on the options in your `[database]` section.
If you're using the `fernet` `[token] provider`, this backend will not be
utilized to persist tokens at all.
"""))
caching = cfg.BoolOpt(