From 0459b60fc95ec29ac6fd32949f3de20e6137088d Mon Sep 17 00:00:00 2001 From: ZhiQiang Fan Date: Tue, 20 Oct 2015 09:05:37 -0600 Subject: [PATCH] remove unused configuration options AODH has nothing to do with collector_workers configuration option, but devstack/plugin.sh still configures it, this is caused by splitting from Ceilometer project but not cleaned very well. This patch also removes an unused configuration option defined in aodh/service.py named notification_workers. Maybe in future, the event alarm needs some worker configurations, we can wait for that but now let's remove it. Change-Id: I5759551673175e2750e8ccc658494d8a04498809 DocImpact: an unused option notification_workers has been removed --- aodh/service.py | 4 ---- devstack/plugin.sh | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/aodh/service.py b/aodh/service.py index 1c0b5b0cc..4ef06a794 100644 --- a/aodh/service.py +++ b/aodh/service.py @@ -32,10 +32,6 @@ OPTS = [ help='Name of this node, which must be valid in an AMQP ' 'key. Can be an opaque identifier. For ZeroMQ only, must ' 'be a valid host name, FQDN, or IP address.'), - cfg.IntOpt('notification_workers', - default=1, - help='Number of workers for notification service. A single ' - 'notification agent is enabled by default.'), cfg.IntOpt('http_timeout', default=600, help='Timeout seconds for HTTP requests. Set it to None to ' diff --git a/devstack/plugin.sh b/devstack/plugin.sh index c887fe7c1..646b363bf 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -155,7 +155,6 @@ function cleanup_aodh { function _aodh_configure_storage_backend { if [ "$AODH_BACKEND" = 'mysql' ] || [ "$AODH_BACKEND" = 'postgresql' ] ; then iniset $AODH_CONF database connection $(database_connection_url aodh) - iniset $AODH_CONF DEFAULT collector_workers $API_WORKERS elif [ "$AODH_BACKEND" = 'mongodb' ] ; then iniset $AODH_CONF database connection mongodb://localhost:27017/aodh cleanup_aodh @@ -189,7 +188,7 @@ function configure_aodh { iniset $AODH_CONF service_credentials os_region_name $REGION_NAME iniset $AODH_CONF service_credentials os_auth_url $KEYSTONE_SERVICE_URI/v2.0 - configure_auth_token_middleware $AODH_CONF aodh $AODH_AUTH_CACHE_DIR + configure_auth_token_middleware $AODH_CONF aodh $AODH_AUTH_CACHE_DIR iniset $AODH_CONF notification store_events $AODH_EVENTS