openstack/aodh
Code Issues Proposed changes

Merge "remove unused configuration options"

Browse Source
This commit is contained in:
Jenkins
2015-10-21 10:30:47 +00:00
committed by Gerrit Code Review
parent ae88ee34a6 0459b60fc9
commit d71c56eb7b
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
aodh/service.py
View File

@@ -32,10 +32,6 @@ OPTS = [
help='Name of this node, which must be valid in an AMQP ' help='Name of this node, which must be valid in an AMQP '
'key. Can be an opaque identifier. For ZeroMQ only, must ' 'key. Can be an opaque identifier. For ZeroMQ only, must '
'be a valid host name, FQDN, or IP address.'), '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', cfg.IntOpt('http_timeout',
default=600, default=600,
help='Timeout seconds for HTTP requests. Set it to None to ' help='Timeout seconds for HTTP requests. Set it to None to '

1
devstack/plugin.sh
View File

@@ -155,7 +155,6 @@ function cleanup_aodh {
function _aodh_configure_storage_backend { function _aodh_configure_storage_backend {
if [ "$AODH_BACKEND" = 'mysql' ] || [ "$AODH_BACKEND" = 'postgresql' ] ; then if [ "$AODH_BACKEND" = 'mysql' ] || [ "$AODH_BACKEND" = 'postgresql' ] ; then
iniset $AODH_CONF database connection $(database_connection_url aodh) iniset $AODH_CONF database connection $(database_connection_url aodh)
iniset $AODH_CONF DEFAULT collector_workers $API_WORKERS
elif [ "$AODH_BACKEND" = 'mongodb' ] ; then elif [ "$AODH_BACKEND" = 'mongodb' ] ; then
iniset $AODH_CONF database connection mongodb://localhost:27017/aodh iniset $AODH_CONF database connection mongodb://localhost:27017/aodh
cleanup_aodh cleanup_aodh