Use upstream pypi before the repo is built
Trying to reverse proxy upstream pypi has not turned out to be very stable, or very useful. We've had many, many reports of stability issues and the additional complexity for offline and proxy usage is just not worth it. Given we already have a mechanism in place to handle using upstream pypi if the repo server is not there yet, disabling this should just result in that mechanism kicking in and all will be well again. Once the repo is built, the reverse proxy to pypiserver will then be exclusively used and the upstream pypi proxy is not necessary anyway. Change-Id: Ic6e4a2d24040655fdd575477ea7438fd6e4d58d9 Needed-By: https://review.openstack.org/584385
This commit is contained in:
parent
1a73053ebd
commit
925273f524
@ -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.
|
||||
|
@ -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"
|
||||
|
@ -181,7 +181,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 %}
|
||||
|
Loading…
Reference in New Issue
Block a user