openstack
/
panko
Code Issues Proposed changes

Merge "clean devstack plugin"

This commit is contained in:
Jenkins 2016-03-21 19:25:02 +00:00 committed by Gerrit Code Review
parent 9fd0e837f7 7cae72527e
commit 001d706b5c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/plugin.sh
View File

@ -276,8 +276,7 @@ function configure_ceilometer {
iniset_rpc_backend ceilometer $CEILOMETER_CONF
iniset $CEILOMETER_CONF DEFAULT notification_topics "$CEILOMETER_NOTIFICATION_TOPICS"
iniset $CEILOMETER_CONF DEFAULT verbose True
iniset $CEILOMETER_CONF oslo_messaging_notifications topics "$CEILOMETER_NOTIFICATION_TOPICS"
iniset $CEILOMETER_CONF DEFAULT debug "$ENABLE_DEBUG_LOG_LEVEL"
if [[ -n "$CEILOMETER_COORDINATION_URL" ]]; then
@ -374,7 +373,7 @@ function init_ceilometer {
# installed. The context is not active during preinstall (when it would
# otherwise makes sense to do the backend services).
function install_ceilometer {
if is_service_enabled ceilometer-acentral ceilometer-anotification ceilometer-alarm-evaluator ; then
if is_service_enabled ceilometer-acentral ceilometer-anotification ; then
_ceilometer_prepare_coordination
fi