Update get-pip to version 3.3

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
This commit is contained in:
Dave Wilde 2018-07-17 14:07:41 -05:00
parent a801ed7400
commit 184dbb8e18
4 changed files with 7 additions and 7 deletions

View File

@ -61,13 +61,13 @@ proxy:
repo_nginx_pypi_upstream: pip.example.org:80
You may also choose to create a local copy of
https://bootstrap.pypa.io/3.2/get-pip.py to remove a dependency on an external
https://bootstrap.pypa.io/3.3/get-pip.py to remove a dependency on an external
resource.
.. code-block:: yaml
# Override PIP installer ("Get modern PIP"): https://bootstrap.pypa.io/3.2/get-pip.py
pip_upstream_url: "http://mirror.example.org/bootstrap.pypa.io/3.2/get-pip.py"
# Override PIP installer ("Get modern PIP"): https://bootstrap.pypa.io/3.3/get-pip.py
pip_upstream_url: "http://mirror.example.org/bootstrap.pypa.io/3.3/get-pip.py"
Distribution specific packages
------------------------------

View File

@ -24,7 +24,7 @@ pip_install_upper_constraints: "{{ repo_release_path }}/requirements_absolute_re
pip_offline_install: false
# 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') }}"
# The URL to the repo server's pypi reverse proxy simple index
pip_default_index: "{{ openstack_repo_url }}/simple"

View File

@ -87,7 +87,7 @@
- name: Set pip upstream URL
set_fact:
pip_upstream_url: >-
{{ ((_repo_data_check.status | default(503)) != 200) | ternary('https://bootstrap.pypa.io/3.2/get-pip.py', __pip_upstream_url) }}
{{ ((_repo_data_check.status | default(503)) != 200) | ternary('https://bootstrap.pypa.io/3.3/get-pip.py', __pip_upstream_url) }}
tags:
- common-pip

View File

@ -378,8 +378,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} ${PIP_OPTS} \