Browse code

Merge "Fix Neutron configuration if Ceilometer is enabled"

Jenkins authored on 2014/07/16 06:03:39
Showing 1 changed files
... ...
@@ -303,6 +303,9 @@ function configure_neutron {
303 303
     if is_service_enabled q-meta; then
304 304
         _configure_neutron_metadata_agent
305 305
     fi
306
+    if is_service_enabled ceilometer; then
307
+        _configure_neutron_ceilometer_notifications
308
+    fi
306 309
 
307 310
     _configure_neutron_debug_command
308 311
 }
... ...
@@ -729,6 +732,10 @@ function _configure_neutron_metadata_agent {
729 729
 
730 730
 }
731 731
 
732
+function _configure_neutron_ceilometer_notifications {
733
+    iniset $NEUTRON_CONF DEFAULT notification_driver neutron.openstack.common.notifier.rpc_notifier
734
+}
735
+
732 736
 function _configure_neutron_lbaas {
733 737
     neutron_agent_lbaas_configure_common
734 738
     neutron_agent_lbaas_configure_agent