From e2c880a61f058664b32197039a9f5fe580b52cbf Mon Sep 17 00:00:00 2001 From: Chhandak Date: Thu, 2 Oct 2014 06:07:08 +0530 Subject: [PATCH] Closes-Bug: #1373811 Updating neutron server with correct plugin Change-Id: Ia868aa225211229143a91884a65ca3ffb08bc393 --- contrail/manifests/contrail_config.pp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/contrail/manifests/contrail_config.pp b/contrail/manifests/contrail_config.pp index 2db00699..0b372896 100644 --- a/contrail/manifests/contrail_config.pp +++ b/contrail/manifests/contrail_config.pp @@ -408,6 +408,15 @@ logoutput => "true" } + $line1="NEUTRON_PLUGIN_CONFIG=\'/etc/neutron/plugins/opencontrail/ContrailPlugin.ini\'" + exec { "config-neutron-server" : + command => "sudo sed -i '/NEUTRON_PLUGIN_CONFIG.*/d' /etc/default/neutron-server && echo \"$line1\" >> /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' + } + ############################### File["/etc/contrail/ctrl-details"]->File["/etc/contrail/service.token"]->Config-template-scripts["contrail-api.conf"]->File["/etc/contrail/contrail_plugin.ini"]->Config-template-scripts["schema_transformer.conf"]->Config-template-scripts["svc_monitor.conf"]->Config-template-scripts["contrail-discovery.conf"]->Config-template-scripts["vnc_api_lib.ini"] @@ -473,7 +482,7 @@ } - Exec["haproxy-exec"]->Exec["exec-cfg-rabbitmq"]->Exec["setup-rabbitmq-cluster"]->Exec["check-rabbitmq-cluster"]->Config-scripts["config-server-setup"]->Config-scripts["quantum-server-setup"]->Exec["setup-verify-quantum-in-keystone"]->Exec["provision-metadata-services"]->Exec["provision-encap-type"]->Exec["exec-provision-control"]->Exec["provision-external-bgp"] + Exec["haproxy-exec"]->Exec["exec-cfg-rabbitmq"]->Exec["setup-rabbitmq-cluster"]->Exec["check-rabbitmq-cluster"]->Config-scripts["config-server-setup"]->Config-scripts["quantum-server-setup"]->Exec["setup-verify-quantum-in-keystone"]->Exec["config-neutron-server"]->Exec["provision-metadata-services"]->Exec["provision-encap-type"]->Exec["exec-provision-control"]->Exec["provision-external-bgp"] # Below is temporary to work-around in Ubuntu as Service resource fails # as upstart is not correctly linked to /etc/init.d/service-name