summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-29 21:19:01 +0000
committerGerrit Code Review <review@openstack.org>2016-07-29 21:19:01 +0000
commitc9bf76dbb845338fd08c0d777ec1e651f868810f (patch)
treeeff8246913f57e3acbb55c45ec5c639f291768c1
parentb735ce37a8f03d0fa11820c4d7342482aa1706a9 (diff)
parent619b07dc987c499b3090dfe4bb15a06150b0df0d (diff)
downloadkeystonemiddleware-c9bf76dbb845338fd08c0d777ec1e651f868810f.tar.gz
Merge "Fix description of option `cache`"
-rw-r--r--keystonemiddleware/auth_token/_opts.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/keystonemiddleware/auth_token/_opts.py b/keystonemiddleware/auth_token/_opts.py
index bf7e557..2e7ac50 100644
--- a/keystonemiddleware/auth_token/_opts.py
+++ b/keystonemiddleware/auth_token/_opts.py
@@ -62,7 +62,11 @@ _OPTS = [
help='How many times are we trying to reconnect when'
' communicating with Identity API Server.'),
cfg.StrOpt('cache',
- help='Env key for the swift cache.'),
+ help='Request environment key where the Swift cache object is'
+ ' stored. When auth_token middleware is deployed with a Swift'
+ ' cache, use this option to have the middleware share a caching'
+ ' backend with swift. Otherwise, use the ``memcached_servers``'
+ ' option instead.'),
cfg.StrOpt('certfile',
help='Required if identity server requires client certificate'),
cfg.StrOpt('keyfile',