X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=debian%2Fpatches%2Ffix-quantum-configuration.patch;h=259686ea84e6405a0ac5197e9af701f6c5902843;hb=refs%2Fheads%2Fopenstack-ci%2Ffuel-5.1.1%2F2014.1.1;hp=b19bd0ea3c18f316602086e10bea9e269fbd5200;hpb=5f1c6af61342a3d3baabaf2bab5c3cc32f3f1ca6;p=openstack-build%2Fneutron-build.git diff --git a/debian/patches/fix-quantum-configuration.patch b/debian/patches/fix-quantum-configuration.patch index b19bd0ea3..259686ea8 100644 --- a/debian/patches/fix-quantum-configuration.patch +++ b/debian/patches/fix-quantum-configuration.patch @@ -1,3 +1,8 @@ +Description: Fixes to neutron configuration for distribution. + Patch various bits of config to be more suitable for packaging. +Author: James Page +Forwarded: not-needed + --- a/etc/neutron.conf +++ b/etc/neutron.conf @@ -7,7 +7,7 @@ @@ -9,16 +14,16 @@ # 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 @@ 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 = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 ++core_plugin = neutron.plugins.ml2.plugin.Ml2Plugin + # Example: core_plugin = ml2 - # Advanced service modules - # service_plugins = -@@ -294,7 +294,7 @@ notification_driver = neutron.openstack. + # (ListOpt) List of service plugin entrypoints to be loaded from the +@@ -380,7 +380,7 @@ notification_driver = neutron.openstack. # 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 @@ -26,8 +31,8 @@ +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 -@@ -318,7 +318,7 @@ signing_dir = $state_path/keystone-signi + # seconds between nodes reporting state to server; should be less than +@@ -404,7 +404,7 @@ signing_dir = $state_path/keystone-signi # 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.)