Add Neutron 2015.1 for Ubuntu 14.04

[openstack-build/neutron-build.git] / trusty / debian / patches / fix-neutron-configuration.patch

diff --git a/debian/patches/fix-neutron-configuration.patch b/trusty/debian/patches/fix-neutron-configuration.patch
similarity index 60%
rename from debian/patches/fix-neutron-configuration.patch
rename to trusty/debian/patches/fix-neutron-configuration.patch
index c306a40397cc4bcdff2356cb3943a360f48cc4da..0b1ec727aa8118c745e94fcbea2325aaa94ff0ac 100644 (file)
--- a/debian/patches/fix-neutron-configuration.patch
+++ b/trusty/debian/patches/fix-neutron-configuration.patch
@@ -1,5 +1,3 @@
-diff --git a/etc/neutron.conf b/etc/neutron.conf
-index 0e61cf7..c5aca0f 100644
 --- a/etc/neutron.conf
 +++ b/etc/neutron.conf
 @@ -60,7 +60,7 @@ lock_path = $state_path/lock
@@ -11,21 +9,21 @@ index 0e61cf7..c5aca0f 100644
  # Example: core_plugin = ml2
  
  # (ListOpt) List of service plugin entrypoints to be loaded from the
-@@ -548,7 +548,7 @@ lock_path = $state_path/lock
+@@ -613,7 +613,7 @@ lock_path = $state_path/lock
  # Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real
  # root filter facility.
- # Change to "sudo" to skip the filtering and just run the comand directly
+ # Change to "sudo" to skip the filtering and just run the command directly
 -# root_helper = sudo
 +root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
  
  # Set to true to add comments to generated iptables rules that describe
  # each rule's purpose. (System must support the iptables comments module.)
-@@ -575,7 +575,7 @@ admin_password = %SERVICE_PASSWORD%
- # connection = mysql://root:pass@127.0.0.1:3306/neutron
+@@ -650,7 +650,7 @@ admin_password = %SERVICE_PASSWORD%
+ [database]
+ # This line MUST be changed to actually run the plugin.
+ # Example:
+-# connection = mysql://root:pass@127.0.0.1:3306/neutron
++connection = sqlite:////var/lib/neutron/neutron.sqlite
  # 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
- # 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
+ # connection = sqlite://