From 58adaa6b75717d39f406cf059c57f3c7f983770a Mon Sep 17 00:00:00 2001
From: Dina Belova <dbelova@mirantis.com>
Date: Fri, 11 Jul 2014 18:18:12 +0400
Subject: [PATCH] Fix Neutron configuration if Ceilometer is enabled

Previously if Ceilometer service was enabled,
configuration option to enable Neutron network
notifications was not set. This fixes it.

Change-Id: Ia53d9db1828ef2daa0ce637b2a2635795856502c
Closes-Bug: #1340754
---
 lib/neutron | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/neutron b/lib/neutron
index 603987216b..4ab0269a22 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -296,6 +296,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
 }
@@ -722,6 +725,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