openstack
/
tripleo-quickstart
Code Issues Proposed changes

Handle pip being installed as /usr/bin/pip3 

This change also stops setting USER_PYTHON_OVERRIDE=python2 when
install-deps.sh is used as an interactive script, because centos-8
should be the default, and also because the python version detection
works fine and shouldn't need a manual override.

Change-Id: Ic53be3203a1d4d75df3e26e70629ab6344b45280
This commit is contained in:
Steve Baker 2020-02-11 10:23:37 +13:00 committed by wes hayutin
parent a3b286151c
commit 5d3a8c334c
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
install-deps.sh
View File

@ -115,6 +115,10 @@ install_deps () {
SETUPTOOLS_PACKAGE=python3-setuptools
VIRTUALENV_PACKAGE=python3-virtualenv
PIP_PACKAGE=python3-pip
if [ -e "/usr/bin/pip3" ] && [ ! -e "/usr/bin/pip" ]; then
# centos-8 installs pip as pip3
sudo alternatives --install /usr/bin/pip pip /usr/bin/pip3 1
fi
else
PYTHON_PACKAGES+=("libselinux-python")
SETUPTOOLS_PACKAGE=python2-setuptools
@ -144,8 +148,6 @@ install_deps () {
check_python_module pip &> /dev/null || {
if yum provides pip 2>&1 | grep 'No matches found' >/dev/null; then
sudo easy_install pip
else
sudo $(package_manager) install $PIP_PACKAGE
fi
}
@ -248,14 +250,6 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
# however, if users want to install by hand
# the option is provided.
# Allow to user to override the python version
export USER_PYTHON_OVERRIDE=python2
# This will allow the user to be prompted for commands
# requiring sudo vs. skipping the install assuming the
# requirements are already installed.
export USER_OVERRIDE_SUDO_CHECK="1"
# install just enough python
install_deps
# install bindep