From ea6a221f681c11e07b80fb784ade12ca004b7451 Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Wed, 17 Sep 2014 16:42:15 +0800 Subject: [PATCH] Add the redis opts to the generate sample shell script * Fix the redis opts typo in setup.cfg * Fix the default value type for reconnect_sleep in redis * add the redis to oslo.config.generator.rc Change-Id: Ibd439e2bdaa46ddf21802724f9fe7fb6f2b61bc5 --- setup.cfg | 2 +- tools/config/oslo.config.generator.rc | 1 + zaqar/queues/storage/redis/options.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index abcde304..9a87525b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -63,7 +63,7 @@ oslo.config.opts = zaqar.queues.storage.pipeline = zaqar.queues.storage.pipeline:_config_options zaqar.queues.storage.pooling = zaqar.queues.storage.pooling:_config_options zaqar.queues.storage.mongodb = zaqar.queues.storage.mongodb.options:_config_options - zaqar.queues.storage.redis = zaqar.queues.storage.redis.options:_config_option + zaqar.queues.storage.redis = zaqar.queues.storage.redis.options:_config_options zaqar.queues.storage.sqlalchemy = zaqar.queues.storage.sqlalchemy.options:_config_options zaqar.queues.transport.wsgi = zaqar.queues.transport.wsgi.driver:_config_options zaqar.queues.transport.base = zaqar.queues.transport.base:_config_options diff --git a/tools/config/oslo.config.generator.rc b/tools/config/oslo.config.generator.rc index 5fa9f6cd..ecb1c66a 100644 --- a/tools/config/oslo.config.generator.rc +++ b/tools/config/oslo.config.generator.rc @@ -3,6 +3,7 @@ export OSLO_CONFIG_GENERATOR_EXTRA_LIBRARIES="zaqar.queues.bootstrap zaqar.queues.storage.pipeline zaqar.queues.storage.pooling zaqar.queues.storage.mongodb + zaqar.queues.storage.redis zaqar.queues.storage.sqlalchemy zaqar.queues.transport.wsgi zaqar.queues.transport.base diff --git a/zaqar/queues/storage/redis/options.py b/zaqar/queues/storage/redis/options.py index f768f8cf..a2c08ef3 100644 --- a/zaqar/queues/storage/redis/options.py +++ b/zaqar/queues/storage/redis/options.py @@ -27,7 +27,7 @@ REDIS_OPTIONS = ( help=('Maximum number of times to retry an operation that ' 'failed due to a redis node failover.')), - cfg.FloatOpt('reconnect_sleep', default=1, + cfg.FloatOpt('reconnect_sleep', default=1.0, help=('Base sleep interval between attempts to reconnect ' 'after a redis node failover. '))