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
This commit is contained in:
Vasyl Saienko 2016-10-05 02:54:06 -04:00
parent a82d657635
commit 57821e73b0
1 changed files with 6 additions and 3 deletions

View File

@ -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 {