correct neutron core plugin patch

for possibility works openvswitch-agent with ml2-plugin.

Blueprint: neutron-ml2-plugin-in-fuel-51

Change-Id: I0ba66c9459b07c7ca8b113bd6fb9ca7544d46c5a

diff --git a/debian/neutron-plugin-openvswitch-agent.upstart b/debian/neutron-plugin-openvswitch-agent.upstart
index 2ca4ecec52fcaf625a4ac4aa44f7616596d80ad9..dd1673888fa7288684efeab86634be0bbc3bb708 100644 (file)
--- a/debian/neutron-plugin-openvswitch-agent.upstart
+++ b/debian/neutron-plugin-openvswitch-agent.upstart
@@ -14,4 +14,4 @@ pre-start script
   chown neutron:root /var/run/neutron
 end script
 
-exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-openvswitch-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --log-file=/var/log/neutron/openvswitch-agent.log
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-openvswitch-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugin.ini --log-file=/var/log/neutron/openvswitch-agent.log

diff --git a/debian/neutron-server.default b/debian/neutron-server.default
index 32045693158340620b19681b0a16ebb97b865f8b..f15e168a36d0e36126507fcafd64651364c618dc 100644 (file)
--- a/debian/neutron-server.default
+++ b/debian/neutron-server.default
@@ -2,4 +2,4 @@
 
 # path to config file corresponding to the core_plugin specified in
 # neutron.conf
-NEUTRON_PLUGIN_CONFIG="/etc/neutron/plugins/ml2/ml2_conf.ini"
+NEUTRON_PLUGIN_CONFIG="/etc/neutron/plugin.ini"