Added missing etc/neutron/plugins/ml2/openvswitch_agent.ini fixes to debian/patches...

[openstack-build/neutron-build.git] / trusty / debian / patches / better-config-defaults.patch

diff --git a/trusty/debian/patches/better-config-defaults.patch b/trusty/debian/patches/better-config-defaults.patch
index 7bd29308b0077f18f33ddab5eec9f85567cb4d06..7f5909f8f34d07ae9d34691447162d4e2f9f050b 100644 (file)
--- a/trusty/debian/patches/better-config-defaults.patch
+++ b/trusty/debian/patches/better-config-defaults.patch
@@ -364,3 +364,104 @@ index 7f91d74..13a781d 100644
  
  # Firewall driver for OVSvApp.
  # firewall_driver = networking_vsphere.drivers.ovs_firewall.OVSFirewallDriver
+diff --git a/etc/neutron/plugins/ml2/openvswitch_agent.ini b/etc/neutron/plugins/ml2/openvswitch_agent.ini
+index 5dd11a8..12e3a0a 100644
+--- a/etc/neutron/plugins/ml2/openvswitch_agent.ini
++++ b/etc/neutron/plugins/ml2/openvswitch_agent.ini
+@@ -5,7 +5,7 @@
+ # attached to this bridge and then "patched" according to their network
+ # connectivity.
+ #
+-# integration_bridge = br-int
++integration_bridge = br-int
+ 
+ # Only used for the agent if tunnel_id_ranges is not empty for
+ # the server.  In most cases, the default value should be fine.
+@@ -35,8 +35,8 @@
+ # Note: If you remove a bridge from this mapping, make sure to disconnect it
+ # from the integration bridge as it won't be managed by the agent anymore.
+ #
+-# bridge_mappings =
+ # Example: bridge_mappings = physnet1:br-eth1
++bridge_mappings = external:br-ex
+ 
+ # (BoolOpt) Use veths instead of patch ports to interconnect the integration
+ # bridge to physical networks. Support kernel without ovs patch port support
+@@ -62,7 +62,7 @@
+ # log_agent_heartbeats = False
+ 
+ # Agent's polling interval in seconds
+-# polling_interval = 2
++polling_interval = 15
+ 
+ # Minimize polling by monitoring ovsdb for interface changes
+ # minimize_polling = True
+@@ -77,10 +77,10 @@
+ # disable tunneling support in the agent.
+ # You can specify as many values here as your compute hosts supports.
+ #
+-# tunnel_types =
+ # Example: tunnel_types = gre
+ # Example: tunnel_types = vxlan
+ # Example: tunnel_types = vxlan, gre
++tunnel_types = gre
+ 
+ # (IntOpt) The port number to utilize if tunnel_types includes 'vxlan'. By
+ # default, this will make use of the Open vSwitch default value of '4789' if
+@@ -102,12 +102,12 @@
+ # RPC calbbacks instead of tunnel_sync/update) on OVS agents in order to
+ # optimize tunnel management.
+ #
+-# l2_population = False
++l2_population = True
+ 
+ # Enable local ARP responder. Requires OVS 2.1. This is only used by the l2
+ # population ML2 MechanismDriver.
+ #
+-# arp_responder = False
++arp_responder = False
+ 
+ # Enable suppression of ARP responses that don't match an IP address that
+ # belongs to the port from which they originate.
+@@ -126,7 +126,7 @@
+ # (BoolOpt) Set to True on L2 agents to enable support
+ # for distributed virtual routing.
+ #
+-# enable_distributed_routing = False
++enable_distributed_routing = False
+ 
+ # (IntOpt) Set new timeout in seconds for new rpc calls after agent receives
+ # SIGTERM. If value is set to 0, rpc timeout won't be changed"
+@@ -137,30 +137,8 @@
+ # Firewall driver for realizing neutron security group function.
+ # firewall_driver = neutron.agent.firewall.NoopFirewallDriver
+ # Example: firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
++firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
+ 
+ # Controls if neutron security group is enabled or not.
+ # It should be false when you use nova security group.
+-# enable_security_group = True
+-
+-#-----------------------------------------------------------------------------
+-# Sample Configurations.
+-#-----------------------------------------------------------------------------
+-#
+-# 1. With VLANs on eth1.
+-# [ovs]
+-# integration_bridge = br-int
+-# bridge_mappings = default:br-eth1
+-#
+-# 2. With GRE tunneling.
+-# [ovs]
+-# integration_bridge = br-int
+-# tunnel_bridge = br-tun
+-# local_ip = 10.0.0.3
+-#
+-# 3. With VXLAN tunneling.
+-# [ovs]
+-# integration_bridge = br-int
+-# tunnel_bridge = br-tun
+-# local_ip = 10.0.0.3
+-# [agent]
+-# tunnel_types = vxlan
++enable_security_group = True