x
/
vmware-nsx
Code Issues Proposed changes

Merge "TVD allow devstack init without V3 transport zone"

This commit is contained in:
Zuul 2018-03-21 09:40:16 +00:00 committed by Gerrit Code Review
parent cec3ed1788 a38a7f127d
commit 3c5cee63df
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/lib/nsx_common
View File

@ -92,7 +92,11 @@ function _nsxv3_ini_set {
}
function nsxv3_configure_service {
_nsxv3_ini_set default_overlay_tz $DEFAULT_OVERLAY_TZ_UUID "The VMware NSX plugin won't work without a default transport zone."
if [[ $1 == "nsx_v3" ]]; then
_nsxv3_ini_set default_overlay_tz $DEFAULT_OVERLAY_TZ_UUID "The VMware NSX plugin won't work without a default transport zone."
else
_nsxv3_ini_set default_overlay_tz $DEFAULT_OVERLAY_TZ_UUID
fi
_nsxv3_ini_set default_vlan_tz $DEFAULT_VLAN_TZ_UUID
if [[ "$DEFAULT_TIER0_ROUTER_UUID" != "" ]]; then
_nsxv3_ini_set default_tier0_router $DEFAULT_TIER0_ROUTER_UUID