x/vmware-nsx
Code Issues Proposed changes

Python3 support - use correct pip

Browse Source 
Use pip3 while python3 is in use

Change-Id: I5d1eb2249b881aefdf1130bd9af00dea9d699bea
This commit is contained in:
Kobi Samoray 2019-11-10 12:05:11 +02:00
parent 7189638533
commit 133a69ae90
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/lib/nsx_common
View File

@ -43,7 +43,7 @@ function install_neutron_projects {
elif use_library_from_git $pkg; then elif use_library_from_git $pkg; then
echo "Project $pkg enabled explicitly from LIBS_FROM_GIT" echo "Project $pkg enabled explicitly from LIBS_FROM_GIT"
else else
sudo -H pip install -e "git+https://opendev.org/openstack/${pkg}@${NEUTRON_BRANCH}#egg=${pkg_renamed}" sudo -H ${PIP} install -e "git+https://opendev.org/openstack/${pkg}@${NEUTRON_BRANCH}#egg=${pkg_renamed}"
sudo chown -R ${USER}:${USER} src/${pkg} sudo chown -R ${USER}:${USER} src/${pkg}
fi fi
done done
@ -55,7 +55,7 @@ function install_neutron_projects {
if is_service_enabled neutron; then if is_service_enabled neutron; then
echo "service Neutron is enabled explicitly by devstack" echo "service Neutron is enabled explicitly by devstack"
else else
sudo -H pip install -e "git+https://opendev.org/openstack/neutron@${NEUTRON_BRANCH}#egg=neutron" sudo -H ${PIP} install -e "git+https://opendev.org/openstack/neutron@${NEUTRON_BRANCH}#egg=neutron"
sudo chown -R ${USER}:${USER} src/neutron sudo chown -R ${USER}:${USER} src/neutron
fi fi
@ -66,7 +66,7 @@ function install_neutron_projects {
if is_service_enabled octavia; then if is_service_enabled octavia; then
echo "service octavia is enabled explicitly by devstack" echo "service octavia is enabled explicitly by devstack"
else else
sudo -H pip install -e "git+https://opendev.org/openstack/octavia@${NEUTRON_BRANCH}#egg=octavia" sudo -H ${PIP} install -e "git+https://opendev.org/openstack/octavia@${NEUTRON_BRANCH}#egg=octavia"
sudo chown -R ${USER}:${USER} src/octavia sudo chown -R ${USER}:${USER} src/octavia
fi fi
} }

2
devstack/plugin.sh
View File

@ -22,8 +22,10 @@ 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' PYTHON='python'
PIP='pip'
if [[ $USE_PYTHON3 == "True" ]]; then if [[ $USE_PYTHON3 == "True" ]]; then
PYTHON='python3' PYTHON='python3'
PIP='pip3'
fi fi
dir=${GITDIR['vmware-nsx']}/devstack dir=${GITDIR['vmware-nsx']}/devstack