From bce506449df568144d0a2693b0a1f8c7ae81d9e6 Mon Sep 17 00:00:00 2001
From: Chhandak <chhandak@juniper.net>
Date: Thu, 29 Jan 2015 18:28:47 +0530
Subject: [PATCH] Adding task to set contrail plugin

Adding task to set contrail plugin in /etc/default/neutron-server
Closes-Bug:1376118
Change-Id: I6333805f0f324d0fa4b9aa9cef40523a4ea7bcbd
---
 .../environment/modules/contrail/manifests/config.pp     | 9 +++++++++
 .../environment/modules/contrail/manifests/params.pp     | 1 +
 2 files changed, 10 insertions(+)

diff --git a/contrail/environment/modules/contrail/manifests/config.pp b/contrail/environment/modules/contrail/manifests/config.pp
index 9a55800a..4d44c853 100644
--- a/contrail/environment/modules/contrail/manifests/config.pp
+++ b/contrail/environment/modules/contrail/manifests/config.pp
@@ -204,6 +204,7 @@
     $internal_vip = $::contrail::params::internal_vip,
     $external_vip = $::contrail::params::external_vip,
     $contrail_internal_vip = $::contrail::params::contrail_internal_vip,
+    $contrail_plugin_location = $::contrail::params::contrail_plugin_location,
     $config_ip_list = $::contrail::params::config_ip_list,
     $config_name_list = $::contrail::params::config_name_list,
     $database_ip_port = $::contrail::params::database_ip_port,
@@ -504,6 +505,14 @@
 	logoutput => true
     }
     ->
+    exec { "config-neutron-server" :
+         command => "sudo sed -i '/NEUTRON_PLUGIN_CONFIG.*/d' /etc/default/neutron-server && echo \"$contrail_plugin_location\" >> /etc/default/neutron-server && service neutron-server restart && echo config-neutron-server >> /etc/contrail/contrail_config_exec.out",
+         onlyif => "test -f /etc/default/neutron-server",
+         unless  => "grep -qx config-neutron-server /etc/contrail/contrail_config_exec.out",
+         provider => shell,
+         logoutput => 'true'
+    }
+    ->
     # initd script wrapper for contrail-discovery
     file { "/etc/init.d/contrail-discovery" :
 	ensure  => present,
diff --git a/contrail/environment/modules/contrail/manifests/params.pp b/contrail/environment/modules/contrail/manifests/params.pp
index ec7ae91f..d5965bbe 100644
--- a/contrail/environment/modules/contrail/manifests/params.pp
+++ b/contrail/environment/modules/contrail/manifests/params.pp
@@ -90,6 +90,7 @@
     $storage_osd_disks,
     $kernel_upgrade = "yes",
     $kernel_version = "3.13.0-34"
+    $contrail_plugin_location  = "NEUTRON_PLUGIN_CONFIG=\'/etc/neutron/plugins/opencontrail/ContrailPlugin.ini\'"
 ) {
     if ($zookeeper_ip_list == undef) {
         $zk_ip_list_to_use = $config_ip_list