openstack/devstack
Code Issues Proposed changes

Always install python3 and its dev package

Browse Source 
Some distros do not install python3/python3-devel with the minimal
install. F29 doesn't install -devel, and neither Centos 7 or 8
install either. This patch ensures that these packages get installed.

Ideally, PYTHON3_VERSION would be set *after* ensuring that python3
was installed, but it gets a little tricky with all of the includes.
This sets it to 3.6 as nothing uses 3.5 anymore.

Change-Id: I7bdfc408b7c18273639ec26eade475856ac43593
This commit is contained in:
Terry Wilson 2019-10-15 19:45:09 +00:00
parent e18325ca67
commit 78cf6f642a
3 changed files with 7 additions and 2 deletions

2
inc/python

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

5
stack.sh

@ -415,8 +415,11 @@ fi
# Ensure python is installed # 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 # Configure Logging
# ----------------- # -----------------

2
stackrc

@ -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 Python 3 to this variable will install the app using that
# version of the interpreter instead of 2.7. # version of the interpreter instead of 2.7.
_DEFAULT_PYTHON3_VERSION="$(_get_python_version python3)" _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. # Just to be more explicit on the Python 2 version to use.
_DEFAULT_PYTHON2_VERSION="$(_get_python_version python2)" _DEFAULT_PYTHON2_VERSION="$(_get_python_version python2)"