diff options
| author | Brant Knudson <bknudson@us.ibm.com> | 2014-10-08 20:15:54 -0500 |
|---|---|---|
| committer | Brant Knudson <bknudson@us.ibm.com> | 2014-10-09 15:46:30 -0500 |
| commit | 91ca44fe3602e72d32464e6ead99f12d21aa069b (patch) | |
| tree | ec8d6f46c70b0f733acfd0cbc56de692f5d88c02 /etc | |
| parent | b96aa6be1296cea82a4d8add55b1cba855e14d95 (diff) | |
| download | heat-91ca44fe3602e72d32464e6ead99f12d21aa069b.tar.gz | |
Update references to auth_token middleware
There's references to the auth_token middleware in keystoncelient.
The auth_token middleware has been moved to keystonemiddleware and
the version in keystoneclient shouldn't be used anymore.
If these references aren't updated, then when options are changed in
keystonemiddleware.auth_token the heat-api will fail to start because
there's duplicate options in keystoneclient.middleware.auth_token.
Change-Id: I04573aa5ff967afe3e00329f797fcc71b779e7b3
Closes-Bug: #1379082
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/heat/heat.conf.sample | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/etc/heat/heat.conf.sample b/etc/heat/heat.conf.sample index 5afda5c50..9d723b217 100644 --- a/etc/heat/heat.conf.sample +++ b/etc/heat/heat.conf.sample @@ -1078,7 +1078,7 @@ [keystone_authtoken] # -# Options defined in keystoneclient.middleware.auth_token +# Options defined in keystonemiddleware.auth_token # # Prefix to prepend at the beginning of the path. Deprecated, @@ -1195,6 +1195,32 @@ # value) #memcache_secret_key=<None> +# (optional) number of seconds memcached server is considered +# dead before it is tried again. (integer value) +#memcache_pool_dead_retry=300 + +# (optional) max total number of open connections to every +# memcached server. (integer value) +#memcache_pool_maxsize=10 + +# (optional) socket timeout in seconds for communicating with +# a memcache server. (integer value) +#memcache_pool_socket_timeout=3 + +# (optional) number of seconds a connection to memcached is +# held unused in the pool before it is closed. (integer value) +#memcache_pool_unused_timeout=60 + +# (optional) number of seconds that an operation will wait to +# get a memcache client connection from the pool. (integer +# value) +#memcache_pool_conn_get_timeout=10 + +# (optional) use the advanced (eventlet safe) memcache client +# pool. The advanced pool will only work under python 2.x. +# (boolean value) +#memcache_use_advanced_pool=false + # (optional) indicate whether to set the X-Service-Catalog # header. If False, middleware will not ask for service # catalog on token validation and will not set the X-Service- |