openstack/openstack-ansible
Code Issues Proposed changes

Update get-pip to version 3.3

Browse Source 
Version 3.2 has a bug with it on some systems that can result in the
following stacktrace: [ http://paste.openstack.org/show/726064 ]. To
correct this issue the version of the get-pip script has been set to 3.3
which does not suffer from the same issue.

Change-Id: I61a7234dc4fbde1b9319874d82fe33578f490abc
Partial-Bug: 1779534
(cherry picked from commit 184dbb8e18)
This commit is contained in:
Dave Wilde 2018-07-17 14:07:41 -05:00 committed by Jesse Pretorius
parent e29797b061
commit f69a336501
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
playbooks/common-tasks/set-pip-upstream-url.yml
View File

@ -23,15 +23,15 @@
method: "HEAD"
register: _repo_data_check
failed_when: false
when: pip_upstream_url != "https://bootstrap.pypa.io/3.2/get-pip.py"
when: pip_upstream_url != "https://bootstrap.pypa.io/3.3/get-pip.py"
tags:
- common-pip
- name: Set pip upstream URL
set_fact:
pip_upstream_url: "https://bootstrap.pypa.io/3.2/get-pip.py"
pip_upstream_url: "https://bootstrap.pypa.io/3.3/get-pip.py"
when:
- pip_upstream_url != "https://bootstrap.pypa.io/3.2/get-pip.py"
- pip_upstream_url != "https://bootstrap.pypa.io/3.3/get-pip.py"
- (_repo_data_check.status | default(503)) != 200
tags:
- common-pip

2
playbooks/inventory/group_vars/all.yml
View File

@ -57,7 +57,7 @@ pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
pip_install_upper_constraints: "{{ repo_release_path }}/requirements_absolute_requirements.txt"
# The URL to retrieve the get-pip.py installation script
pip_upstream_url: "{{ (pip_offline_install | bool) | ternary('https://bootstrap.pypa.io/3.2/get-pip.py', repo_release_path ~ '/get-pip.py') }}"
pip_upstream_url: "{{ (pip_offline_install | bool) | ternary('https://bootstrap.pypa.io/3.3/get-pip.py', repo_release_path ~ '/get-pip.py') }}"
## kernel modules for specific group hosts
# :param name: name of the kernel module

4
scripts/scripts-library.sh
View File

@ -253,8 +253,8 @@ function get_pip {
${GETPIP_CMD} ${GET_PIP_URL} > ${GETPIP_FILE}
else
# Otherwise, try the two standard URL's
${GETPIP_CMD} https://bootstrap.pypa.io/3.2/get-pip.py > ${GETPIP_FILE}\
|| ${GETPIP_CMD} https://raw.githubusercontent.com/pypa/get-pip/master/3.2/get-pip.py > ${GETPIP_FILE}
${GETPIP_CMD} https://bootstrap.pypa.io/3.3/get-pip.py > ${GETPIP_FILE}\
|| ${GETPIP_CMD} https://raw.githubusercontent.com/pypa/get-pip/master/3.3/get-pip.py > ${GETPIP_FILE}
fi
${GETPIP_PYTHON_EXEC_PATH} ${GETPIP_FILE} \