From b7175773dc14868188db8f31653a2fffb3811f0f Mon Sep 17 00:00:00 2001
From: Gary Kotton <gkotton@vmware.com>
Date: Wed, 16 Sep 2015 04:31:27 -0700
Subject: [PATCH] Ensure that DHCP agent is configured with correct bridge name

If a bridge that is not br-int is used then devstack fails to get
the DHCP agent up and running.

Change-Id: I7e49e309e26754345c2a06e7758b41aefd464290
---
 devstack/lib/vmware_dvs    | 1 +
 devstack/lib/vmware_nsx    | 1 +
 devstack/lib/vmware_nsx_v3 | 1 +
 3 files changed, 3 insertions(+)

diff --git a/devstack/lib/vmware_dvs b/devstack/lib/vmware_dvs
index f6693b87a5..58df201146 100644
--- a/devstack/lib/vmware_dvs
+++ b/devstack/lib/vmware_dvs
@@ -72,6 +72,7 @@ function neutron_plugin_configure_debug_command {
 function neutron_plugin_configure_dhcp_agent {
     iniset $Q_DHCP_CONF_FILE DEFAULT enable_isolated_metadata True
     iniset $Q_DHCP_CONF_FILE DEFAULT enable_metadata_network True
+    iniset $Q_DHCP_CONF_FILE DEFAULT ovs_integration_bridge $OVS_BRIDGE
 }
 
 function neutron_plugin_configure_l3_agent {
diff --git a/devstack/lib/vmware_nsx b/devstack/lib/vmware_nsx
index 7988cae49c..aa8e22bbf0 100644
--- a/devstack/lib/vmware_nsx
+++ b/devstack/lib/vmware_nsx
@@ -75,6 +75,7 @@ function neutron_plugin_configure_dhcp_agent {
     iniset $Q_DHCP_CONF_FILE DEFAULT enable_isolated_metadata True
     iniset $Q_DHCP_CONF_FILE DEFAULT enable_metadata_network True
     iniset $Q_DHCP_CONF_FILE DEFAULT ovs_use_veth True
+    iniset $Q_DHCP_CONF_FILE DEFAULT ovs_integration_bridge $OVS_BRIDGE
 }
 
 function neutron_plugin_configure_l3_agent {
diff --git a/devstack/lib/vmware_nsx_v3 b/devstack/lib/vmware_nsx_v3
index d27b5de75e..c43b99c598 100644
--- a/devstack/lib/vmware_nsx_v3
+++ b/devstack/lib/vmware_nsx_v3
@@ -75,6 +75,7 @@ function neutron_plugin_configure_dhcp_agent {
     iniset $Q_DHCP_CONF_FILE DEFAULT enable_isolated_metadata True
     iniset $Q_DHCP_CONF_FILE DEFAULT enable_metadata_network True
     iniset $Q_DHCP_CONF_FILE DEFAULT ovs_use_veth True
+    iniset $Q_DHCP_CONF_FILE DEFAULT ovs_integration_bridge $OVS_BRIDGE
 }
 
 function neutron_plugin_configure_l3_agent {