From 8bc23cd7f5c7c8e0c393eb0b5b292bea080c6b11 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Sat, 7 Jun 2014 17:59:12 +0800 Subject: [PATCH] Also patches dhcp_agent.ini Change-Id: Icdadf7f68710987d97875e6758769631d46abdce Rewritten-From: 95a9602353de0c21b61c7dfa33709d5448fedc4d --- trusty/debian/changelog | 1 + .../sane-defaults-for-dhcp_agent.ini.patch | 40 +++++++++++++++++++ trusty/debian/patches/series | 1 + 3 files changed, 42 insertions(+) create mode 100644 trusty/debian/patches/sane-defaults-for-dhcp_agent.ini.patch diff --git a/trusty/debian/changelog b/trusty/debian/changelog index fc9ee4c67..6a5226672 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -2,6 +2,7 @@ neutron (2014.1-8) unstable; urgency=medium * Added sane-defaults-for-ml2_conf.ini.patch. * Added missing dbconfig-common dependency. + * Also patches dhcp_agent.ini and dhcp_agent.ini for sane defaults. -- Thomas Goirand Sat, 07 Jun 2014 17:27:55 +0800 diff --git a/trusty/debian/patches/sane-defaults-for-dhcp_agent.ini.patch b/trusty/debian/patches/sane-defaults-for-dhcp_agent.ini.patch new file mode 100644 index 000000000..6f8001a90 --- /dev/null +++ b/trusty/debian/patches/sane-defaults-for-dhcp_agent.ini.patch @@ -0,0 +1,40 @@ +Description: Sane defaults for dhcp_agent.ini + Otherwise it doesn't work by default, which is a pitty... +Author: Thomas Goirand +Forwarded: no +Last-Update: 2014-06-07 + +--- neutron-2014.1.orig/etc/dhcp_agent.ini ++++ neutron-2014.1/etc/dhcp_agent.ini +@@ -9,26 +9,21 @@ + + # The DHCP agent requires an interface driver be set. Choose the one that best + # matches your plugin. +-# interface_driver = +- +-# Example of interface_driver option for OVS based plugins(OVS, Ryu, NEC, NVP, +-# BigSwitch/Floodlight) +-# interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver ++# Example of interface_driver option for OVS based plugins (OVS, Ryu, NEC, NVP, BigSwitch/Floodlight): interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver ++# Example of interface_driver option for LinuxBridge: interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver ++interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver + + # Name of Open vSwitch bridge to use +-# ovs_integration_bridge = br-int ++ovs_integration_bridge = br-int + + # Use veth for an OVS interface or not. + # Support kernels with limited namespace support + # (e.g. RHEL 6.5) so long as ovs_use_veth is set to True. + # ovs_use_veth = False + +-# Example of interface_driver option for LinuxBridge +-# interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver +- + # The agent can use other DHCP drivers. Dnsmasq is the simplest and requires + # no additional setup of the DHCP server. +-# dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq ++dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq + + # Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and + # iproute2 package that supports namespaces). diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series index dbac7db6d..e40b8e9a0 100644 --- a/trusty/debian/patches/series +++ b/trusty/debian/patches/series @@ -6,3 +6,4 @@ OVS_lib_defer_apply_doesn_t_handle_concurrency.patch Properly_apply_column_default_in_migration_pool_monitor_status.patch Install_SNAT_rules_for_ipv4_only.patch sane-defaults-for-ml2_conf.ini.patch +sane-defaults-for-dhcp_agent.ini.patch -- 2.45.2