From 57821e73b030e2d04f4e0e87a533c3624e9a3ee2 Mon Sep 17 00:00:00 2001
From: Vasyl Saienko <vsaienko@mirantis.com>
Date: Wed, 5 Oct 2016 02:54:06 -0400
Subject: [PATCH] Skip create_ovs_taps() for multitenancy case

With multitenancy case there is no need to create a hacky
connection between brbm and br-int. This patch ensure that
we do not call devstack create_ovs_taps() with multitenancy
case.

Change-Id: I1326a3f83d596655d577c48f642ac3ba8a8b6ee2
---
 devstack/lib/ironic | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index 17b4c49b82..dad2d7ce27 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -978,9 +978,12 @@ function create_bridge_and_vms {
             -p $vbmc_port -f $IRONIC_VM_SPECS_DISK_FORMAT $log_arg" >> $IRONIC_VM_MACS_CSV_FILE
         vbmc_port=$((vbmc_port+1))
     done
-    local ironic_net_id
-    ironic_net_id=$(openstack network show "$PRIVATE_NETWORK_NAME" -c id -f value)
-    create_ovs_taps $ironic_net_id
+
+    if [[ -z "${IRONIC_PROVISION_NETWORK_NAME}" ]]; then
+        local ironic_net_id
+        ironic_net_id=$(openstack network show "$PRIVATE_NETWORK_NAME" -c id -f value)
+        create_ovs_taps $ironic_net_id
+    fi
 }
 
 function wait_for_nova_resources {