openstack/ironic
Code Issues Proposed changes

Merge "Skip create_ovs_taps() for multitenancy case"

Browse Source
This commit is contained in:
Jenkins 2016-10-18 14:23:04 +00:00 committed by Gerrit Code Review
commit 5f015dc4dd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devstack/lib/ironic
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 {