X-Git-Url: https://review.fuel-infra.org/gitweb?p=openstack-build%2Fneutron-build.git;a=blobdiff_plain;f=debian%2Fpatches%2Ffix-quantum-configuration.patch;fp=debian%2Fpatches%2Ffix-quantum-configuration.patch;h=259686ea84e6405a0ac5197e9af701f6c5902843;hp=4d7ef439a677a76d066bbacf0a4bd09cc4338dfa;hb=4cca60531b51db68e6023ea6daa60cc33d277826;hpb=3dea7869947d652cb9d069c3b9fcbd3f4c32ec3b diff --git a/debian/patches/fix-quantum-configuration.patch b/debian/patches/fix-quantum-configuration.patch index 4d7ef439a..259686ea8 100644 --- a/debian/patches/fix-quantum-configuration.patch +++ b/debian/patches/fix-quantum-configuration.patch @@ -3,8 +3,6 @@ Description: Fixes to neutron configuration for distribution. Author: James Page Forwarded: not-needed -diff --git a/etc/neutron.conf b/etc/neutron.conf -index 1e2226f..a5fe086 100644 --- a/etc/neutron.conf +++ b/etc/neutron.conf @@ -7,7 +7,7 @@ @@ -25,7 +23,7 @@ index 1e2226f..a5fe086 100644 # Example: core_plugin = ml2 # (ListOpt) List of service plugin entrypoints to be loaded from the -@@ -320,7 +320,7 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier +@@ -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 @@ -34,7 +32,7 @@ index 1e2226f..a5fe086 100644 # =========== items for agent management extension ============= # seconds between nodes reporting state to server; should be less than -@@ -344,7 +344,7 @@ signing_dir = $state_path/keystone-signing +@@ -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.) @@ -43,6 +41,3 @@ index 1e2226f..a5fe086 100644 # The SQLAlchemy connection string used to connect to the slave database # slave_connection = --- -1.8.5.2 -