x/vmware-nsx
Code Issues Proposed changes

Devstack: Use the right python version in cleanup

Browse Source 
Change-Id: I498de68226789bb6c33df4caf51bec56c6335a45
This commit is contained in:
Adit Sarfaty 2018-08-16 14:10:34 +03:00
parent fb3baeac73
commit 8d5632d0b9
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
devstack/plugin.sh
View File

@ -21,6 +21,11 @@ GITDIR['vmware-nsxlib']=$DEST/vmware-nsxlib
GITREPO['vmware-nsxlib']=${NSXLIB_REPO:-${GIT_BASE}/openstack/vmware-nsxlib.git} GITREPO['vmware-nsxlib']=${NSXLIB_REPO:-${GIT_BASE}/openstack/vmware-nsxlib.git}
GITBRANCH['vmware-nsxlib']=${NSXLIB_BRANCH:-master} GITBRANCH['vmware-nsxlib']=${NSXLIB_BRANCH:-master}
PYTHON='python'
if [[ $USE_PYTHON3 == "True" ]]; then
PYTHON='python3'
fi
dir=${GITDIR['vmware-nsx']}/devstack dir=${GITDIR['vmware-nsx']}/devstack
if [[ "$1" == "stack" && "$2" == "install" ]]; then if [[ "$1" == "stack" && "$2" == "install" ]]; then
@ -35,10 +40,10 @@ if [[ $Q_PLUGIN == 'vmware_nsx_v' ]]; then
source $dir/lib/vmware_nsx_v source $dir/lib/vmware_nsx_v
if [[ "$1" == "unstack" ]]; then if [[ "$1" == "unstack" ]]; then
db_connection=$(iniget $NEUTRON_CONF database connection) db_connection=$(iniget $NEUTRON_CONF database connection)
python $dir/tools/nsxv_cleanup.py --vsm-ip ${NSXV_MANAGER_URI/https:\/\/} --user $NSXV_USER --password $NSXV_PASSWORD --db-connection $db_connection $PYTHON $dir/tools/nsxv_cleanup.py --vsm-ip ${NSXV_MANAGER_URI/https:\/\/} --user $NSXV_USER --password $NSXV_PASSWORD --db-connection $db_connection
elif [[ "$1" == "clean" ]]; then elif [[ "$1" == "clean" ]]; then
if is_service_enabled q-svc || is_service_enabled neutron-api; then if is_service_enabled q-svc || is_service_enabled neutron-api; then
python $dir/tools/nsxv_cleanup.py --vsm-ip ${NSXV_MANAGER_URI/https:\/\/} --user $NSXV_USER --password $NSXV_PASSWORD $PYTHON $dir/tools/nsxv_cleanup.py --vsm-ip ${NSXV_MANAGER_URI/https:\/\/} --user $NSXV_USER --password $NSXV_PASSWORD
fi fi
fi fi
@ -64,11 +69,11 @@ elif [[ $Q_PLUGIN == 'vmware_nsx_v3' ]]; then
IFS=',' IFS=','
NSX_MANAGER=($NSX_MANAGER) NSX_MANAGER=($NSX_MANAGER)
unset IFS unset IFS
python $dir/tools/nsxv3_cleanup.py --mgr-ip $NSX_MANAGER --user $NSX_USER --password $NSX_PASSWORD --db-connection $db_connection $PYTHON $dir/tools/nsxv3_cleanup.py --mgr-ip $NSX_MANAGER --user $NSX_USER --password $NSX_PASSWORD --db-connection $db_connection
fi fi
elif [[ "$1" == 'clean' ]]; then elif [[ "$1" == 'clean' ]]; then
if is_service_enabled q-svc || is_service_enabled neutron-api; then if is_service_enabled q-svc || is_service_enabled neutron-api; then
python $dir/tools/nsxv3_cleanup.py --mgr-ip $NSX_MANAGER --user $NSX_USER --password $NSX_PASSWORD $PYTHON $dir/tools/nsxv3_cleanup.py --mgr-ip $NSX_MANAGER --user $NSX_USER --password $NSX_PASSWORD
fi fi
fi fi
elif [[ $Q_PLUGIN == 'vmware_nsx_tvd' ]]; then elif [[ $Q_PLUGIN == 'vmware_nsx_tvd' ]]; then
@ -85,19 +90,19 @@ elif [[ $Q_PLUGIN == 'vmware_nsx_tvd' ]]; then
NSX_MANAGER=($NSX_MANAGER) NSX_MANAGER=($NSX_MANAGER)
unset IFS unset IFS
if [[ "$NSX_MANAGER" != "" ]]; then if [[ "$NSX_MANAGER" != "" ]]; then
python $dir/tools/nsxv3_cleanup.py --mgr-ip $NSX_MANAGER --user $NSX_USER --password $NSX_PASSWORD --db-connection $db_connection $PYTHON $dir/tools/nsxv3_cleanup.py --mgr-ip $NSX_MANAGER --user $NSX_USER --password $NSX_PASSWORD --db-connection $db_connection
fi fi
if [[ "$NSXV_MANAGER_URI" != "" ]]; then if [[ "$NSXV_MANAGER_URI" != "" ]]; then
python $dir/tools/nsxv_cleanup.py --vsm-ip ${NSXV_MANAGER_URI/https:\/\/} --user $NSXV_USER --password $NSXV_PASSWORD --db-connection $db_connection $PYTHON $dir/tools/nsxv_cleanup.py --vsm-ip ${NSXV_MANAGER_URI/https:\/\/} --user $NSXV_USER --password $NSXV_PASSWORD --db-connection $db_connection
fi fi
fi fi
elif [[ "$1" == 'clean' ]]; then elif [[ "$1" == 'clean' ]]; then
if is_service_enabled q-svc || is_service_enabled neutron-api; then if is_service_enabled q-svc || is_service_enabled neutron-api; then
if [[ "$NSX_MANAGER" != "" ]]; then if [[ "$NSX_MANAGER" != "" ]]; then
python $dir/tools/nsxv3_cleanup.py --mgr-ip $NSX_MANAGER --user $NSX_USER --password $NSX_PASSWORD $PYTHON $dir/tools/nsxv3_cleanup.py --mgr-ip $NSX_MANAGER --user $NSX_USER --password $NSX_PASSWORD
fi fi
if [[ "$NSXV_MANAGER_URI" != "" ]]; then if [[ "$NSXV_MANAGER_URI" != "" ]]; then
python $dir/tools/nsxv_cleanup.py --vsm-ip ${NSXV_MANAGER_URI/https:\/\/} --user $NSXV_USER --password $NSXV_PASSWORD $PYTHON $dir/tools/nsxv_cleanup.py --vsm-ip ${NSXV_MANAGER_URI/https:\/\/} --user $NSXV_USER --password $NSXV_PASSWORD
fi fi
fi fi
fi fi