From 84437e7afc67732d346c2528cfbe2d58d445925c Mon Sep 17 00:00:00 2001
From: Salvatore Orlando <sorlando@vmware.com>
Date: Tue, 4 Jun 2019 15:19:58 -0700
Subject: [PATCH] [devstack] Skip ovs_cleanup for vmware_nsx plugins

This step is unnecessary and will trigger issues with ovsdb
connectivity from stein onwards

Change-Id: I626c462c2e5702c384c4e3324fd942d3ebf34506
---
 devstack/lib/nsx_v3_p_common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devstack/lib/nsx_v3_p_common b/devstack/lib/nsx_v3_p_common
index 0f8e8d8d2e..bf3eb7520f 100644
--- a/devstack/lib/nsx_v3_p_common
+++ b/devstack/lib/nsx_v3_p_common
@@ -136,7 +136,7 @@ function setup_integration_bridge_common {
     iniset $NEUTRON_CONF DEFAULT ovs_integration_bridge $OVS_BRIDGE
     iniset $NEUTRON_CONF OVS ovsdb_connection $(_ovsdb_connection)
     iniset $NEUTRON_CONF OVS ovsdb_interface vsctl
-    _neutron_ovs_base_setup_bridge $OVS_BRIDGE
+    _neutron_ovs_base_add_bridge $OVS_BRIDGE
     sudo ovs-vsctl set bridge $OVS_BRIDGE external_ids:bridge-id=nsx-managed
     sudo ovs-vsctl set-manager $(_ovsdb_connection)
 }