openstack
/
devstack
Code Issues Proposed changes

Merge "Always install python3 and its dev package"

This commit is contained in:
Zuul 2020-02-15 16:01:08 +00:00 committed by Gerrit Code Review
parent 64b3c5f468 78cf6f642a
commit 80758e6932
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/python
View File

@ -456,6 +456,8 @@ function install_python3 {
apt_get install python${PYTHON3_VERSION} python${PYTHON3_VERSION}-dev
elif is_suse; then
install_package python3-devel python3-dbm
elif is_fedora; then
install_package python3 python3-devel
fi
}

5
stack.sh
View File

@ -415,8 +415,11 @@ fi
# Ensure python is installed
# --------------------------
is_package_installed python || install_package python
install_python3
if ! python3_enabled; then
is_package_installed python || install_package python
fi
# Configure Logging
# -----------------

2
stackrc
View File

@ -142,7 +142,7 @@ export USE_PYTHON3=$(trueorfalse True USE_PYTHON3)
# version of Python 3 to this variable will install the app using that
# version of the interpreter instead of 2.7.
_DEFAULT_PYTHON3_VERSION="$(_get_python_version python3)"
export PYTHON3_VERSION=${PYTHON3_VERSION:-${_DEFAULT_PYTHON3_VERSION:-3.5}}
export PYTHON3_VERSION=${PYTHON3_VERSION:-${_DEFAULT_PYTHON3_VERSION:-3.6}}
# Just to be more explicit on the Python 2 version to use.
_DEFAULT_PYTHON2_VERSION="$(_get_python_version python2)"