notifier: move from alarm to top-level

Also move some options for the REST notifier from the alarm group to the
default one.

Change-Id: Ic6ae4677ec0968ddf58e68eaf06f59204f52d56b
This commit is contained in:
Julien Danjou
2015-07-21 16:30:12 +02:00
parent ca8f0cc24a
commit 795bdb80b6
12 changed files with 34 additions and 35 deletions

View File

@@ -49,20 +49,20 @@ aodh.alarm.evaluator =
gnocchi_aggregation_by_metrics_threshold = aodh.alarm.evaluator.gnocchi:GnocchiThresholdEvaluator
gnocchi_aggregation_by_resources_threshold = aodh.alarm.evaluator.gnocchi:GnocchiThresholdEvaluator
aodh.alarm.notifier =
log = aodh.alarm.notifier.log:LogAlarmNotifier
test = aodh.alarm.notifier.test:TestAlarmNotifier
http = aodh.alarm.notifier.rest:RestAlarmNotifier
https = aodh.alarm.notifier.rest:RestAlarmNotifier
trust+http = aodh.alarm.notifier.trust:TrustRestAlarmNotifier
trust+https = aodh.alarm.notifier.trust:TrustRestAlarmNotifier
aodh.notifier =
log = aodh.notifier.log:LogAlarmNotifier
test = aodh.notifier.test:TestAlarmNotifier
http = aodh.notifier.rest:RestAlarmNotifier
https = aodh.notifier.rest:RestAlarmNotifier
trust+http = aodh.notifier.trust:TrustRestAlarmNotifier
trust+https = aodh.notifier.trust:TrustRestAlarmNotifier
console_scripts =
aodh-api = aodh.cmd.api:main
aodh-dbsync = aodh.cmd.eventlet.storage:dbsync
aodh-expirer = aodh.cmd.eventlet.storage:expirer
aodh-alarm-evaluator = aodh.cmd.eventlet.alarm:evaluator
aodh-alarm-notifier = aodh.cmd.eventlet.alarm:notifier
aodh-notifier = aodh.cmd.eventlet.alarm:notifier
oslo.config.opts =
aodh = aodh.opts:list_opts