x/vmware-nsx
Code Issues Proposed changes

Merge "NSX|V3: only run cleanup for devstack if q-svc is enabled"

Browse Source
This commit is contained in:
Jenkins 2016-08-25 10:20:09 +00:00 committed by Gerrit Code Review
commit 7bc1274cbf
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
devstack/plugin.sh
View File

@ -43,11 +43,14 @@ elif [[ $Q_PLUGIN == 'vmware_nsx_v3' ]]; then
init_vmware_nsx_v3 init_vmware_nsx_v3
elif [[ "$1" == "unstack" ]]; then elif [[ "$1" == "unstack" ]]; then
stop_vmware_nsx_v3 stop_vmware_nsx_v3
NSX_MANAGER=${NSX_MANAGERS:-$NSX_MANAGER} # only clean up when q-svc (legacy support) or neutron-api is enabled
IFS=',' if is_service_enabled q-svc || is_service_enabled neutron-api; then
NSX_MANAGER=($NSX_MANAGER) NSX_MANAGER=${NSX_MANAGERS:-$NSX_MANAGER}
unset IFS IFS=','
python $dir/tools/nsxv3_cleanup.py --mgr-ip $NSX_MANAGER --user $NSX_USER --password $NSX_PASSWORD NSX_MANAGER=($NSX_MANAGER)
unset IFS
python $dir/tools/nsxv3_cleanup.py --mgr-ip $NSX_MANAGER --user $NSX_USER --password $NSX_PASSWORD
fi
fi fi
elif [[ $Q_PLUGIN == 'vmware_dvs' ]]; then elif [[ $Q_PLUGIN == 'vmware_dvs' ]]; then
source $dir/lib/vmware_dvs source $dir/lib/vmware_dvs