From 46f90e99004e1ef76a7363165e340941b8c9a638 Mon Sep 17 00:00:00 2001 From: "Jay S. Bryant" Date: Thu, 25 Sep 2014 15:58:41 -0500 Subject: [PATCH] Update /etc/cinder/cinder.conf.sample for memcache It appears that an update to keystone middleware earlier today added options for memcache_secret_key, memcache_pool_dead_retry, memcache_pool_maxsize, memcache_pool_socket_timeout, memcache_pool_unused_timeout, memcache_pool_conn_get_timeout and memcache_use_advanced_pool. The commit that added these options was: a7beb50b38be5c3dd4c44d68ad79d1bb206dab6b - "Add an optional advanced pool of memcached clients". This has once again caused the check_uptodate.sh script to fail. This patch updates cinder.sample.conf . Change-Id: Ibcf19ccc81a56a9a3e795022e3e07bc061fa9401 Closes-bug: 1374154 --- etc/cinder/cinder.conf.sample | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample index ab9f2537d..de342bd37 100644 --- a/etc/cinder/cinder.conf.sample +++ b/etc/cinder/cinder.conf.sample @@ -2641,6 +2641,32 @@ # value) #memcache_secret_key= +# (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- -- 2.45.2