From b28d3134994187d355f31d6aeb72cf85ba3f5f87 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 26 Sep 2013 13:36:09 +0800 Subject: [PATCH] Fixed debian/patches/better-config-default.patch --- debian/patches/better-config-default.patch | 50 +++++++++++++++++-- ...a-valid-default-for-interface_driver.patch | 26 ---------- debian/patches/series | 1 - 3 files changed, 47 insertions(+), 30 deletions(-) delete mode 100644 debian/patches/fix-a-valid-default-for-interface_driver.patch diff --git a/debian/patches/better-config-default.patch b/debian/patches/better-config-default.patch index 680f1ba14..a88c714f8 100644 --- a/debian/patches/better-config-default.patch +++ b/debian/patches/better-config-default.patch @@ -1,8 +1,21 @@ -Description: A configuration that should work by default +Description: Better config default + The default of Neutron make it so that it's not usable by default, and hard to + parse with maintainer scripts. This patch fixes that. Author: Thomas Goirand -Forwarded: not-needed -Last-Update: 2013-09-13 +Forwarded: no +Last-Update: 2013-09-26 +--- neutron-2013.2~b3.orig/etc/l3_agent.ini ++++ neutron-2013.2~b3/etc/l3_agent.ini +@@ -8,7 +8,7 @@ + + # Example of interface_driver option for OVS based plugins (OVS, Ryu, NEC) + # that supports L3 agent +-# interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver ++interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver + + # Use veth for an OVS interface or not. + # Support kernels with limited namespace support --- neutron-2013.2~b3.orig/etc/neutron.conf +++ neutron-2013.2~b3/etc/neutron.conf @@ -45,7 +45,7 @@ lock_path = $state_path/lock @@ -14,6 +27,26 @@ Last-Update: 2013-09-13 # Advanced service modules # service_plugins = +@@ -119,16 +119,16 @@ lock_path = $state_path/lock + # SSL certification authority file (valid only if SSL enabled)' + # kombu_ssl_ca_certs = + # IP address of the RabbitMQ installation +-# rabbit_host = localhost ++rabbit_host = localhost + # Password of the RabbitMQ server +-# rabbit_password = guest ++rabbit_password = guest + # Port where RabbitMQ server is running/listening + # rabbit_port = 5672 + # RabbitMQ single or HA cluster (host:port pairs i.e: host1:5672, host2:5672) + # rabbit_hosts is defaulted to '$rabbit_host:$rabbit_port' + # rabbit_hosts = localhost:5672 + # User ID used for RabbitMQ connections +-# rabbit_userid = guest ++rabbit_userid = guest + # Location of a virtual RabbitMQ installation. + # rabbit_virtual_host = / + # Maximum retries with trying to connect to RabbitMQ @@ -294,7 +294,7 @@ notification_driver = neutron.openstack. # Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real # root filter facility. @@ -37,6 +70,17 @@ Last-Update: 2013-09-13 # The SQLAlchemy connection string used to connect to the slave database # slave_connection = +--- neutron-2013.2~b3.orig/etc/lbaas_agent.ini ++++ neutron-2013.2~b3/etc/lbaas_agent.ini +@@ -13,7 +13,7 @@ + + # Example of interface_driver option for OVS based plugins (OVS, Ryu, NEC, NVP, + # BigSwitch/Floodlight) +-# interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver ++interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver + + # Use veth for an OVS interface or not. + # Support kernels with limited namespace support --- neutron-2013.2~b3.orig/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini +++ neutron-2013.2~b3/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini @@ -30,7 +30,7 @@ diff --git a/debian/patches/fix-a-valid-default-for-interface_driver.patch b/debian/patches/fix-a-valid-default-for-interface_driver.patch deleted file mode 100644 index 8b43b2bbe..000000000 --- a/debian/patches/fix-a-valid-default-for-interface_driver.patch +++ /dev/null @@ -1,26 +0,0 @@ -Description: Fix a valid default for interface_driver -Author: Thomas Goirand -Last-Update: 2013-09-20 - ---- neutron-2013.2~b3.orig/etc/l3_agent.ini -+++ neutron-2013.2~b3/etc/l3_agent.ini -@@ -8,7 +8,7 @@ - - # Example of interface_driver option for OVS based plugins (OVS, Ryu, NEC) - # that supports L3 agent --# interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver -+interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver - - # Use veth for an OVS interface or not. - # Support kernels with limited namespace support ---- neutron-2013.2~b3.orig/etc/lbaas_agent.ini -+++ neutron-2013.2~b3/etc/lbaas_agent.ini -@@ -13,7 +13,7 @@ - - # Example of interface_driver option for OVS based plugins (OVS, Ryu, NEC, NVP, - # BigSwitch/Floodlight) --# interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver -+interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver - - # Use veth for an OVS interface or not. - # Support kernels with limited namespace support diff --git a/debian/patches/series b/debian/patches/series index 83a6467ab..385c8b781 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ better-config-default.patch -fix-a-valid-default-for-interface_driver.patch -- 2.45.2