X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Fpatches%2Ffix-neutron-configuration.patch;fp=trusty%2Fdebian%2Fpatches%2Ffix-neutron-configuration.patch;h=0000000000000000000000000000000000000000;hb=33f494780fed13daabda23be6ceef83210e1d403;hp=0b1ec727aa8118c745e94fcbea2325aaa94ff0ac;hpb=54c2ba6a6661f3214775d91c5755c37c685574a4;p=openstack-build%2Fneutron-build.git

diff --git a/trusty/debian/patches/fix-neutron-configuration.patch b/trusty/debian/patches/fix-neutron-configuration.patch
deleted file mode 100644
index 0b1ec727a..000000000
--- a/trusty/debian/patches/fix-neutron-configuration.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/etc/neutron.conf
-+++ b/etc/neutron.conf
-@@ -60,7 +60,7 @@ lock_path = $state_path/lock
- # previous versions, the class name of a plugin can be specified instead of its
- # entrypoint name.
- #
--# core_plugin =
-+core_plugin = ml2
- # Example: core_plugin = ml2
- 
- # (ListOpt) List of service plugin entrypoints to be loaded from the
-@@ -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 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.)
-@@ -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://