From 1721204f8671963b68f509d1487fe5982d96191b Mon Sep 17 00:00:00 2001
From: Chhandak <chhandak@juniper.net>
Date: Wed, 28 Jan 2015 20:12:46 +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: I19f9847ac889a493a0ac310dc0ced1b79de6ffac
---
 .../environment/modules/contrail/manifests/config.pp     | 9 +++++++++
 .../environment/modules/contrail/manifests/params.pp     | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/contrail/environment/modules/contrail/manifests/config.pp b/contrail/environment/modules/contrail/manifests/config.pp
index 3c3b9848..0cb2a1ac 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,
@@ -497,6 +498,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 4cd034e6..16bd168a 100644
--- a/contrail/environment/modules/contrail/manifests/params.pp
+++ b/contrail/environment/modules/contrail/manifests/params.pp
@@ -86,7 +86,8 @@
     $storage_admin_key,
     $storage_virsh_uuid,
     $storage_monitor_hosts,
-    $storage_osd_disks
+    $storage_osd_disks,
+    $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