openstack/openstack-ansible
Code Issues Proposed changes

Merge "Use python3 for the ansible-runtime venv"

Browse Source
This commit is contained in:
Zuul
2019-09-10 09:47:25 +00:00
committed by Gerrit Code Review
parent 5c7cdd321b fe19ed7ab5
commit 54419bd5f4
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/bootstrap-ansible.sh
View File

@@ -86,12 +86,8 @@ case ${DISTRO_ID} in
opensuse*) opensuse*)
zypper -n install -l git-core curl autoconf gcc gcc-c++ \ zypper -n install -l git-core curl autoconf gcc gcc-c++ \
netcat-openbsd python python-xml python-devel gcc \ netcat-openbsd python python-xml python-devel gcc \
libffi-devel libopenssl-devel python-setuptools python-virtualenv libffi-devel libopenssl-devel python-setuptools python-virtualenv \
# Leap 42.3 ships with python3.4 which is not supported by ansible and as patterns-devel-python-devel_python3
# such we are using python2
# See https://github.com/ansible/ansible/issues/24180
source /etc/os-release
[[ ${VERSION} =~ 42 ]] && PYTHON_EXEC_PATH="/usr/bin/python2"
;; ;;
esac esac
@@ -109,9 +105,7 @@ elif [ -n "$HTTP_PROXY" ]; then
PIP_OPTS+="--proxy $HTTP_PROXY" PIP_OPTS+="--proxy $HTTP_PROXY"
fi fi
# Force using python2. When python3 and python2 dual stack is supported uncomment the following: PYTHON_EXEC_PATH="${PYTHON_EXEC_PATH:-$(which python3 || which python2 || which python)}"
#PYTHON_EXEC_PATH="${PYTHON_EXEC_PATH:-$(which python3 || which python2 || which python)}"
PYTHON_EXEC_PATH="${PYTHON_EXEC_PATH:-$(which python2 || which python)}"
PYTHON_VERSION="$($PYTHON_EXEC_PATH -c 'import sys; print(".".join(map(str, sys.version_info[:3])))')" PYTHON_VERSION="$($PYTHON_EXEC_PATH -c 'import sys; print(".".join(map(str, sys.version_info[:3])))')"
# Use https when Python with native SNI support is available # Use https when Python with native SNI support is available