From 539a644ec32aac2aa4ad77cba6cdea112149db84 Mon Sep 17 00:00:00 2001
From: Martin Magr <mmagr@redhat.com>
Date: Thu, 3 Apr 2014 15:04:33 +0200
Subject: [PATCH] Make CONFIG_NEUTRON_OVS_VXLAN_UDP_PORT work with ML2

Group NEUTRON_OVS_PLUGIN_AND_AGENT_VXLAN does not get loaded when
ML2 with VXLAN is used. This patch is fixing it.

Change-Id: I1528726bb8380c8d9ed20855a62e8198086b1a38
---
 packstack/plugins/neutron_350.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packstack/plugins/neutron_350.py b/packstack/plugins/neutron_350.py
index 109615693..a89acd0c8 100644
--- a/packstack/plugins/neutron_350.py
+++ b/packstack/plugins/neutron_350.py
@@ -483,8 +483,15 @@ def initConfig(controllerObject):
         return use_openvswitch_plugin_tunnel(config) or use_ml2_with_ovs(config)
 
     def use_openvswitch_vxlan(config):
-        return (use_openvswitch_plugin_tunnel(config) and
-                config['CONFIG_NEUTRON_OVS_TENANT_NETWORK_TYPE'] == 'vxlan')
+        ovs_vxlan = (
+            use_openvswitch_plugin_tunnel(config) and
+            config['CONFIG_NEUTRON_OVS_TENANT_NETWORK_TYPE'] == 'vxlan'
+        )
+        ml2_vxlan = (
+            use_ml2_with_ovs(config) and
+            'vxlan' in config['CONFIG_NEUTRON_ML2_TENANT_NETWORK_TYPES']
+        )
+        return ovs_vxlan or ml2_vxlan
 
 
     conf_groups = [