From 228aba84d42e54aad97a0f58ba17aa5fdf8df340 Mon Sep 17 00:00:00 2001
From: nitishkrishna <nitishk@juniper.net>
Date: Mon, 29 Jun 2015 10:54:58 -0700
Subject: [PATCH] Closes-Bug: #1469264 - Neutron notification_driver param set
 incorrectly.

Previously it was being set to empty if ceilometer was not enabled.
Patch 2:
- Reverting change to set this config for Ceilometer
- Whatever is the default value when neutron is installed, that will be taken
Patch 3:
- Missed removing one line

Change-Id: I557d7e3bcb8a4d9002fe65ccdc015212534055dd
---
 contrail/environment/modules/neutron/manifests/init.pp     | 7 -------
 .../modules/openstack/manifests/common/contrail/neutron.pp | 7 -------
 2 files changed, 14 deletions(-)

diff --git a/contrail/environment/modules/neutron/manifests/init.pp b/contrail/environment/modules/neutron/manifests/init.pp
index eb36c673..267ce244 100644
--- a/contrail/environment/modules/neutron/manifests/init.pp
+++ b/contrail/environment/modules/neutron/manifests/init.pp
@@ -189,11 +189,6 @@
 #   If set to boolean false, it will not log to any directory
 #   Defaults to /var/log/neutron
 #
-# [*notification_driver*]
-#   (optional) Driver or drivers to handle sending notifications.
-#   Value can be a string or a list.
-#   Defaults to []
-#
 class neutron (
   $enabled                     = true,
   $package_ensure              = 'present',
@@ -251,7 +246,6 @@
   $log_facility                = 'LOG_USER',
   $log_file                    = false,
   $log_dir                     = '/var/log/neutron',
-  $notification_driver         = '',
 ) {
 
   include neutron::params
@@ -321,7 +315,6 @@
     'DEFAULT/allow_overlapping_ips':   value => $allow_overlapping_ips;
     'DEFAULT/control_exchange':        value => $control_exchange;
     'DEFAULT/rpc_backend':             value => $rpc_backend;
-    'DEFAULT/notification_driver':     value => $notification_driver;
     'agent/root_helper':               value => $root_helper;
     'agent/report_interval':           value => $report_interval;
   }
diff --git a/contrail/environment/modules/openstack/manifests/common/contrail/neutron.pp b/contrail/environment/modules/openstack/manifests/common/contrail/neutron.pp
index 0645ba15..5a36f6a7 100644
--- a/contrail/environment/modules/openstack/manifests/common/contrail/neutron.pp
+++ b/contrail/environment/modules/openstack/manifests/common/contrail/neutron.pp
@@ -5,12 +5,6 @@
 # This follows the suggest deployment from the neutron Administrator Guide.
 class openstack::common::contrail::neutron {
   $controller_management_address = $::openstack::config::controller_address_management
-  $enable_ceilometer = $::contrail::params::enable_ceilometer
-  if ($enable_ceilometer) {
-       $notification_driver = 'neutron.openstack.common.notifier.rpc_notifier'
-  } else {
-       $notification_driver = ''
-  }
 
   $data_network = $::openstack::config::network_data
   $data_address = ip_for_network($data_network)
@@ -38,7 +32,6 @@
     debug                 => $::openstack::config::debug,
     verbose               => $::openstack::config::verbose,
     service_plugins       => ['neutron_plugin_contrail.plugins.opencontrail.loadbalancer.plugin.LoadBalancerPlugin'],
-    notification_driver   => $notification_driver,
   }
 
   class { '::neutron::server':