Default the Linuxbridge agent to enabling VXLAN

Linux kernels from 3.7 and up have supported VXLAN with Linuxbridge.
I think it's time we default to enabling this support in the
Linuxbridge agent in Neutron as well.

DocImpact

Change-Id: I8a99c973b4816e3a2845cdb8abd71d6250bc4800

diff --git a/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini b/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
index 94fe980364923c8a222c4d6982bc2002391f0bb0..dac338b868f415c77d2116e9650255b230360578 100644 (file)
--- a/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
+++ b/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
@@ -34,8 +34,8 @@
 [vxlan]
 # (BoolOpt) enable VXLAN on the agent
 # VXLAN support can be enabled when agent is managed by ml2 plugin using
-# linuxbridge mechanism driver. Useless if set while using linuxbridge plugin.
-# enable_vxlan = False
+# linuxbridge mechanism driver.
+# enable_vxlan = True
 #
 # (IntOpt) use specific TTL for vxlan interface protocol packets
 # ttl =

diff --git a/neutron/plugins/linuxbridge/common/config.py b/neutron/plugins/linuxbridge/common/config.py
index 7184e7af8224111967d9689c509c8a35c7a00f82..90c6548dc8331986b647348f7148b447620a8cc2 100644 (file)
--- a/neutron/plugins/linuxbridge/common/config.py
+++ b/neutron/plugins/linuxbridge/common/config.py
@@ -32,7 +32,7 @@ vlan_opts = [
 ]
 
 vxlan_opts = [
-    cfg.BoolOpt('enable_vxlan', default=False,
+    cfg.BoolOpt('enable_vxlan', default=True,
                 help=_("Enable VXLAN on the agent. Can be enabled when "
                        "agent is managed by ml2 plugin using linuxbridge "
                        "mechanism driver")),