From b7a56fd1b44649daa1f768157e68a135b9e01dd1 Mon Sep 17 00:00:00 2001 From: Kyle Mestery Date: Tue, 3 Mar 2015 14:57:31 +0000 Subject: [PATCH] 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 --- etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini | 4 ++-- neutron/plugins/linuxbridge/common/config.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini b/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini index 94fe9803649..dac338b868f 100644 --- 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 7184e7af822..90c6548dc83 100644 --- 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")),