diff --git a/doc/source/user/limited-connectivity/index.rst b/doc/source/user/limited-connectivity/index.rst index 4f23443999..1330097817 100644 --- a/doc/source/user/limited-connectivity/index.rst +++ b/doc/source/user/limited-connectivity/index.rst @@ -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/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/get-pip.py - pip_upstream_url: "http://mirror.example.org/bootstrap.pypa.io/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 ------------------------------ diff --git a/inventory/group_vars/all/pip.yml b/inventory/group_vars/all/pip.yml index b940bb8af6..45acea5620 100644 --- a/inventory/group_vars/all/pip.yml +++ b/inventory/group_vars/all/pip.yml @@ -27,7 +27,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" diff --git a/playbooks/common-tasks/set-pip-upstream-url.yml b/playbooks/common-tasks/set-pip-upstream-url.yml index dab3c888d3..814545e369 100644 --- a/playbooks/common-tasks/set-pip-upstream-url.yml +++ b/playbooks/common-tasks/set-pip-upstream-url.yml @@ -24,7 +24,7 @@ timeout: 3 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 @@ -32,9 +32,9 @@ # pip isn't locked to it. - 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 diff --git a/scripts/scripts-library.sh b/scripts/scripts-library.sh index 9030c905ad..41dd922970 100755 --- a/scripts/scripts-library.sh +++ b/scripts/scripts-library.sh @@ -337,8 +337,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} \