From 4fdda78380ca1736cd6e951ba594243b5263deca Mon Sep 17 00:00:00 2001
From: garyk <gkotton@vmware.com>
Date: Sun, 17 Apr 2016 07:08:16 +0000
Subject: [PATCH] Revert "NSX: remove usage of ovs_use_veth"

When the veth is not set the port does not come up on the NSX

This reverts commit 0f2ab55e02c2fcb514bae2ffa86779114c935cf3.

Change-Id: Ib0d6ca285ac75e865dab3144612f90c33ac16819
---
 devstack/lib/vmware_nsx    | 1 +
 devstack/lib/vmware_nsx_v3 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/devstack/lib/vmware_nsx b/devstack/lib/vmware_nsx
index c2b1473d98..f4f6db56fa 100644
--- a/devstack/lib/vmware_nsx
+++ b/devstack/lib/vmware_nsx
@@ -74,6 +74,7 @@ function neutron_plugin_configure_dhcp_agent {
     setup_integration_bridge
     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
 }
 
diff --git a/devstack/lib/vmware_nsx_v3 b/devstack/lib/vmware_nsx_v3
index 75fd0a50ec..2a9bfa7cbb 100644
--- a/devstack/lib/vmware_nsx_v3
+++ b/devstack/lib/vmware_nsx_v3
@@ -74,6 +74,7 @@ function neutron_plugin_configure_dhcp_agent {
     setup_integration_bridge
     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
 }