zuul/zuul-jobs
Code Issues Proposed changes

Remove mirror_domain from configure-mirror

Browse Source 
After talking to clarkb, we decided we can drop this in favor of just
using the mirror_host.

Change-Id: Ie4ce336174aa2a825d125f7e0d9a256de139908b
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-08-03 14:49:13 -04:00
parent 4e65c3b89c
commit 05e6980baa
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
playbooks/unittests/pre.yaml
View File

@ -3,7 +3,6 @@
- role: configure-mirrors - role: configure-mirrors
# TODO(mordred) When we have site-local variables, these should go there # TODO(mordred) When we have site-local variables, these should go there
mirror_host: "mirror.{{ nodepool.region | lower }}.{{ nodepool.provider | lower }}.openstack.org" mirror_host: "mirror.{{ nodepool.region | lower }}.{{ nodepool.provider | lower }}.openstack.org"
mirror_domain: openstack.org
- role: bindep - role: bindep
bindep_profile: test bindep_profile: test
bindep_dir: "{{ zuul_work_dir }}" bindep_dir: "{{ zuul_work_dir }}"

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

@ -5,9 +5,5 @@ Role Variables
mirror_host mirror_host
The base host for mirror servers The base host for mirror servers
mirror_domain
Domain of the mirror. Use in pydistutils to allow find-links arguments to
be used if they point at this domain.
pypi_mirror pypi_mirror
URL to override the generated pypi mirror url based on mirror_host URL to override the generated pypi mirror url based on mirror_host

4
roles/configure-mirrors/templates/.pydistutils.cfg.j2
View File

@ -1,6 +1,4 @@
# {{ ansible_managed }} # {{ ansible_managed }}
[easy_install] [easy_install]
index_url = {{ pypi_mirror }} index_url = {{ pypi_mirror }}
{% if mirror_domain is defined %} allow_hosts = {{ mirror_host }}
allow_hosts = *.{{ mirror_domain }}
{% endif %}