zuul/zuul-jobs
Code Issues Proposed changes

Merge "Add pypi_fqdn to differentiate it package mirrors"

Browse Source
This commit is contained in:
Zuul 2020-01-06 16:36:58 +00:00 committed by Gerrit Code Review
commit e21bed0c48
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
roles/configure-mirrors/README.rst
View File

@ -7,10 +7,15 @@ An ansible role to configure services to use mirrors.
The base host for mirror servers. The base host for mirror servers.
.. zuul:rolevar:: pypi_fqdn
:default: {{ mirror_fqdn }}
The base host for PyPi mirror server.
.. zuul:rolevar:: pypi_mirror .. zuul:rolevar:: pypi_mirror
URL to override the generated pypi mirror url based on URL to override the generated pypi mirror url based on
:zuul:rolevar:`configure-mirrors.mirror_fqdn`. :zuul:rolevar:`configure-mirrors.pypi_fqdn`.
.. zuul:rolevar:: set_apt_mirrors_trusted .. zuul:rolevar:: set_apt_mirrors_trusted
:default: False :default: False

3
roles/configure-mirrors/defaults/main.yaml
View File

@ -1,4 +1,5 @@
mirror_fqdn: "{{ zuul_site_mirror_fqdn|default(omit) }}" mirror_fqdn: "{{ zuul_site_mirror_fqdn|default(omit) }}"
pypi_mirror: "http://{{ mirror_fqdn }}/pypi/simple" pypi_fqdn: "{{ mirror_fqdn }}"
pypi_mirror: "http://{{ pypi_fqdn }}/pypi/simple"
set_apt_mirrors_trusted: False set_apt_mirrors_trusted: False
wheel_mirror: "http://{{ mirror_fqdn }}/wheel/{{ ansible_distribution | lower }}-{{ ansible_distribution_version }}-{{ ansible_architecture | lower }}" wheel_mirror: "http://{{ mirror_fqdn }}/wheel/{{ ansible_distribution | lower }}-{{ ansible_distribution_version }}-{{ ansible_architecture | lower }}"

2
roles/configure-mirrors/templates/etc/pip.conf.j2
View File

@ -2,5 +2,5 @@
[global] [global]
timeout = 60 timeout = 60
index-url = {{ pypi_mirror }} index-url = {{ pypi_mirror }}
trusted-host = {{ mirror_fqdn }} trusted-host = {{ pypi_fqdn }}
extra-index-url = {{ wheel_mirror }} extra-index-url = {{ wheel_mirror }}