Merge "Fix Neutron configuration if Ceilometer is enabled"

This commit is contained in:
Jenkins 2014-07-15 21:03:39 +00:00 committed by Gerrit Code Review
commit df2cc34db6

View File

@ -303,6 +303,9 @@ function configure_neutron {
if is_service_enabled q-meta; then
_configure_neutron_metadata_agent
fi
if is_service_enabled ceilometer; then
_configure_neutron_ceilometer_notifications
fi
_configure_neutron_debug_command
}
@ -729,6 +732,10 @@ function _configure_neutron_metadata_agent {
}
function _configure_neutron_ceilometer_notifications {
iniset $NEUTRON_CONF DEFAULT notification_driver neutron.openstack.common.notifier.rpc_notifier
}
function _configure_neutron_lbaas {
neutron_agent_lbaas_configure_common
neutron_agent_lbaas_configure_agent