Merge "Use upstream pypi before the repo is built"

doc/source/user/limited-connectivity/index.rst

@@ -56,10 +56,6 @@ proxy:
       # Custom upstream pip index used when building repo server contents
       repo_build_pip_default_index: http://pip.example.org/simple
 
-      # Custom upstream pip mirror host:port which must be able to supply all
-      # packages not built by the repo server itself.
-      repo_nginx_pypi_upstream: pip.example.org:80
-
 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.

inventory/group_vars/repo_all.yml

@@ -73,9 +73,3 @@ pkg_locations:
   - "{{ playbook_dir }}/../"
   - /etc/ansible/roles
   - /etc/openstack_deploy
-
-# The URL to retrieve the get-pip.py installation script locally
-pip_upstream_url: "{{ repo_release_path | replace(internal_lb_vip_address, '127.0.0.1') }}/get-pip.py"
-
-# The URL to the local PyPI reverse proxy
-pip_default_index: "{{ openstack_repo_url | replace(internal_lb_vip_address, '127.0.0.1') }}/simple"

tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2

@@ -184,7 +184,6 @@ nova_service_negate:
   - "nova-resetnetwork.service"
 
 {% if _pypi_wheel_mirror is defined and _pypi_wheel_mirror.stdout_lines is defined %}
-repo_nginx_pypi_upstream: "{{ _pypi_wheel_mirror.stdout_lines[0] | netloc }}"
 repo_build_pip_extra_indexes:
  - "{{ _pypi_wheel_mirror.stdout_lines[1] }}"
 {% endif %}