openstack
/
openstack-ansible
Code Issues Proposed changes

Merge "Use python3.8 for CentOS 8"

This commit is contained in:
Zuul 2021-12-23 18:19:25 +00:00 committed by Gerrit Code Review
parent edf6c3ed93 ec8f6f9c79
commit c46383fc9f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/bootstrap-ansible.sh
View File

@ -74,10 +74,11 @@ case ${DISTRO_ID} in
centos|rhel)
dnf -y install \
git curl autoconf gcc gcc-c++ nc \
python3 python3-devel libselinux-python3 \
python38 python38-devel libselinux-python3 \
systemd-devel pkgconf \
openssl-devel libffi-devel \
rsync wget
PYTHON_EXEC_PATH="$(which python3.8)"
;;
ubuntu|debian)
apt-get update

8
scripts/scripts-library.sh
View File

@ -64,7 +64,7 @@ function build_ansible_runtime_venv {
# - Ubuntu Xenial has 15.0.1, holding pip 8.1.1, setuptools 20.3, wheel 0.29
# See also: https://packages.ubuntu.com/xenial/python-virtualenv
python3 -m venv /opt/ansible-runtime --clear
${PYTHON_EXEC_PATH} -m venv /opt/ansible-runtime --clear
# The vars used to prepare the Ansible runtime venv
PIP_OPTS+=" --constraint global-requirement-pins.txt"
@ -91,9 +91,9 @@ function build_ansible_runtime_venv {
fi
# Add SELinux support to the venv
if [ -d "/usr/lib64/python3.6/site-packages/selinux/" ]; then
rsync -avX /usr/lib64/python3.6/site-packages/selinux/ /opt/ansible-runtime/lib64/python3.6/site-packages/selinux/
rsync -avX /usr/lib64/python3.6/site-packages/_selinux.cpython-36m-x86_64-linux-gnu.so /opt/ansible-runtime/lib64/python3.6/site-packages/
if [ -d "/usr/lib64/python3.8/site-packages/selinux/" ]; then
rsync -avX /usr/lib64/python3.8/site-packages/selinux/ /opt/ansible-runtime/lib64/python3.8/site-packages/selinux/
rsync -avX /usr/lib64/python3.8/site-packages/_selinux.cpython-36m-x86_64-linux-gnu.so /opt/ansible-runtime/lib64/python3.8/site-packages/
fi
}