diff --git a/doc/source/user/limited-connectivity/index.rst b/doc/source/user/limited-connectivity/index.rst index 14f15fe7d6..fa46def2ba 100644 --- a/doc/source/user/limited-connectivity/index.rst +++ b/doc/source/user/limited-connectivity/index.rst @@ -56,15 +56,6 @@ proxy: # Custom upstream pip index used when building repo server contents repo_build_pip_default_index: http://pip.example.org/simple -You may also choose to create a local copy of -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.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/playbooks/common-tasks/set-pip-vars.yml b/playbooks/common-tasks/set-pip-vars.yml index 90cb594a25..c9b3b8e884 100644 --- a/playbooks/common-tasks/set-pip-vars.yml +++ b/playbooks/common-tasks/set-pip-vars.yml @@ -18,13 +18,6 @@ # If it is not yet up, then it will use the upstream upper constraints # for the SHA currently pinned and will set the default index to pypi. -- name: Backup the default pip_upstream_url - run_once: yes - set_fact: - __pip_upstream_url: "{{ pip_upstream_url }}" - when: - - __pip_upstream_url is not defined - - name: Backup the default pip_install_upper_constraints run_once: yes set_fact: @@ -39,17 +32,6 @@ when: - __pip_default_index is not defined -- name: Test internal repo URL for the current get-pip.py script - run_once: yes - uri: - url: "{{ __pip_upstream_url }}" - method: "HEAD" - timeout: 3 - register: _repo_data_check - failed_when: false - tags: - - common-pip - - name: Test internal repo URL for the current upper constraints file run_once: yes uri: @@ -77,16 +59,6 @@ tags: - common-constraints -# If we can't reach the internal repo, we need to ensure -# pip isn't locked to it. -- name: Set pip upstream URL - run_once: yes - set_fact: - 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 - - name: Set pip install upper constraints run_once: yes set_fact: diff --git a/playbooks/defaults/distro_install.yml b/playbooks/defaults/distro_install.yml index ff229c1535..64fa3c5fca 100644 --- a/playbooks/defaults/distro_install.yml +++ b/playbooks/defaults/distro_install.yml @@ -67,7 +67,6 @@ zaqar_install_method: distro zun_install_method: distro # default variables for PIP since we are not using the repo server -pip_upstream_url: "https://bootstrap.pypa.io/3.3/get-pip.py" pip_default_index: "https://pypi.python.org/simple" tempest_venv_download: false diff --git a/playbooks/defaults/source_install.yml b/playbooks/defaults/source_install.yml index b9d711e495..11e1a1ce86 100644 --- a/playbooks/defaults/source_install.yml +++ b/playbooks/defaults/source_install.yml @@ -29,8 +29,6 @@ openstack_repo_git_url: "git://{{ internal_lb_vip_address }}" venv_base_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ os_distro_version }}" tempest_venv_download_url: "{{ venv_base_download_url }}/tempest-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz" -# The URL to retrieve the get-pip.py installation script -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" # The upper constraints to apply to all pip installations