From: Sergey Vasilenko <svasilenko@mirantis.com>
Date: Mon, 7 Jul 2014 16:41:52 +0000 (+0400)
Subject: correct neutron core plugin patch
X-Git-Tag: mos-9.0~44
X-Git-Url: https://review.fuel-infra.org/gitweb?p=openstack-build%2Fneutron-build.git;a=commitdiff_plain;h=38bdd7b0b663ceefd3a0d997a2d6e12ef551c98d

correct neutron core plugin patch

for possibility works openvswitch-agent with ml2-plugin.

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

Change-Id: I792d6578ab293c55ed23ca7dca55793f9bf1ad68
---

diff --git a/debian/neutron-ovs-cleanup.upstart b/debian/neutron-ovs-cleanup.upstart
index 7ae53a199..ea36ef336 100644
--- a/debian/neutron-ovs-cleanup.upstart
+++ b/debian/neutron-ovs-cleanup.upstart
@@ -16,5 +16,5 @@ pre-start script
   chown neutron:neutron /var/run/neutron-ovs-cleanup
   mkdir -p /var/lock/neutron-ovs-cleanup
   chown neutron:root /var/lock/neutron-ovs-cleanup
-  /usr/bin/neutron-ovs-cleanup --config-file=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --log-file=/var/log/neutron/neutron-ovs-cleanup.log
+  /usr/bin/neutron-ovs-cleanup --config-file=/etc/neutron/plugin.ini --log-file=/var/log/neutron/neutron-ovs-cleanup.log
 end script
diff --git a/debian/neutron-plugin-openvswitch-agent.upstart b/debian/neutron-plugin-openvswitch-agent.upstart
index b87adac58..457f7ad59 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/ovs-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/ovs-agent.log
diff --git a/debian/neutron-server.default b/debian/neutron-server.default
index c4b8e862b..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/openvswitch/ovs_neutron_plugin.ini"
+NEUTRON_PLUGIN_CONFIG="/etc/neutron/plugin.ini"
diff --git a/debian/patches/fix-quantum-configuration.patch b/debian/patches/fix-quantum-configuration.patch
index df77dbe6c..4b4780b7f 100644
--- a/debian/patches/fix-quantum-configuration.patch
+++ b/debian/patches/fix-quantum-configuration.patch
@@ -1,38 +1,37 @@
 --- a/etc/neutron.conf
 +++ b/etc/neutron.conf
 @@ -7,7 +7,7 @@
- 
+
  # Where to store Neutron state files.  This directory must be writable by the
  # user executing the agent.
 -# state_path = /var/lib/neutron
 +state_path = /var/lib/neutron
- 
+
  # Where to store lock files
  lock_path = $state_path/lock
-@@ -45,7 +45,7 @@ lock_path = $state_path/lock
- # api_extensions_path =
- 
- # Neutron plugin provider module
+@@ -50,7 +50,7 @@
+ # previous versions, the class name of a plugin can be specified instead of its
+ # entrypoint name.
+ #
 -# core_plugin =
 +core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2
- 
- # Advanced service modules
- # service_plugins =
-@@ -295,7 +295,7 @@ notification_driver = neutron.openstack.
- # Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real
+ # Example: core_plugin = ml2
+
+ # (ListOpt) List of service plugin entrypoints to be loaded from the
+@@ -490,6 +490,7 @@
  # root filter facility.
  # Change to "sudo" to skip the filtering and just run the comand directly
--# root_helper = sudo
+ # root_helper = sudo
 +root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
- 
+
  # =========== items for agent management extension =============
  # seconds between nodes reporting state to server; should be less than
-@@ -319,7 +319,7 @@ signing_dir = $state_path/keystone-signi
+@@ -512,7 +513,7 @@
  # connection = mysql://root:pass@127.0.0.1:3306/neutron
  # Replace 127.0.0.1 above with the IP address of the database used by the
  # main neutron server. (Leave it as is if the database runs on this host.)
 -# connection = sqlite://
 +connection = sqlite:////var/lib/neutron/neutron.sqlite
- 
- # The SQLAlchemy connection string used to connect to the slave database
- # slave_connection =
+ # NOTE: In deployment the [database] section and its connection attribute may
+ # be set in the corresponding core plugin '.ini' file. However, it is suggested
+ # to put the [database] section and its connection attribute in this
diff --git a/debian/tests/openvswitch-plugin b/debian/tests/openvswitch-plugin
index 01dcaf23c..a9bfb9be1 100644
--- a/debian/tests/openvswitch-plugin
+++ b/debian/tests/openvswitch-plugin
@@ -6,7 +6,6 @@ set -e
 apt-get -y install neutron-plugin-openvswitch
 
 # update plugin path
-sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/openvswitch\/ovs_neutron_plugin\.ini\"/g' /etc/default/neutron-server
 sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.openvswitch\.ovs_neutron_plugin\.OVSNeutronPluginV2/g' /etc/neutron/neutron.conf
 service neutron-server restart  > /dev/null 2>&1
 if pidof -x neutron-server > /dev/null; then