From 3f6d8fcad6cb85c567518e66f6c3276fb56ec1dc Mon Sep 17 00:00:00 2001 From: Sergey Vasilenko Date: Mon, 7 Jul 2014 20:41:52 +0400 Subject: [PATCH] correct neutron core plugin patch for possibility works openvswitch-agent with ml2-plugin. Blueprint: neutron-ml2-plugin-in-fuel-51 Change-Id: I0ba66c9459b07c7ca8b113bd6fb9ca7544d46c5a --- debian/neutron-plugin-openvswitch-agent.upstart | 2 +- debian/neutron-server.default | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/neutron-plugin-openvswitch-agent.upstart b/debian/neutron-plugin-openvswitch-agent.upstart index 2ca4ecec5..dd1673888 100644 --- 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 320456931..f15e168a3 100644 --- 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" -- 2.32.3