Merge "Pass PYTHON env var to memory tracker"
diff --git a/inc/python b/inc/python
index bd58905..cd90ac8 100644
--- a/inc/python
+++ b/inc/python
@@ -489,11 +489,7 @@
if is_ubuntu; then
apt_get install python${PYTHON3_VERSION} python${PYTHON3_VERSION}-dev
elif is_fedora; then
- if [ "$os_VENDOR" = "Fedora" ]; then
- install_package python${PYTHON3_VERSION//.}
- else
- install_package python${PYTHON3_VERSION//.} python${PYTHON3_VERSION//.}-devel
- fi
+ install_package python${PYTHON3_VERSION}-devel python${PYTHON3_VERSION}-pip
fi
}
diff --git a/lib/apache b/lib/apache
index 744c0f1..5ab74b7 100644
--- a/lib/apache
+++ b/lib/apache
@@ -137,7 +137,7 @@
install_package libapache2-mod-wsgi-py3
elif is_fedora; then
sudo rm -f /etc/httpd/conf.d/000-*
- install_package httpd python3-mod_wsgi
+ install_package httpd python${PYTHON3_VERSION}-mod_wsgi
# rpm distros dont enable httpd by default so enable it to support reboots.
sudo systemctl enable httpd
# For consistency with Ubuntu, switch to the worker mpm, as
diff --git a/lib/tls b/lib/tls
index cff5c63..fa0a448 100644
--- a/lib/tls
+++ b/lib/tls
@@ -367,7 +367,7 @@
if [[ "$GLOBAL_VENV" == "True" ]] ; then
capath=$($DEVSTACK_VENV/bin/python3 -c $'try:\n from requests import certs\n print (certs.where())\nexcept ImportError: pass')
else
- capath=$(python3 -c $'try:\n from requests import certs\n print (certs.where())\nexcept ImportError: pass')
+ capath=$(python$PYTHON3_VERSION -c $'try:\n from requests import certs\n print (certs.where())\nexcept ImportError: pass')
fi
if [[ ! $capath == "" && ! $capath =~ ^/etc/.* && ! -L $capath ]]; then
if is_fedora; then