zuul/zuul-jobs
Code Issues Proposed changes

Rename mirror_host to mirror_fqdn in configure-mirrors

Browse Source 
It make more sense to revert to mirror_fqdn, since it is a FQDN.

Change-Id: I4a0749b64a71e551e4fbea5b416b46d2d6433d0b
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-08-03 14:53:57 -04:00
parent 05e6980baa
commit e59abec7a3
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/unittests/pre.yaml
View File

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

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

@ -2,8 +2,8 @@ An ansible role to configure services to use mirrors.
Role Variables
mirror_host
mirror_fqdn
The base host for mirror servers
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_fqdn

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

@ -1 +1 @@
pypi_mirror: "http://{{ mirror_host }}/pypi/simple"
pypi_mirror: "http://{{ mirror_fqdn }}/pypi/simple"

2
roles/configure-mirrors/tasks/main.yaml
View File

@ -1,2 +1,2 @@
- include: mirror.yaml
when: mirror_host is defined
when: mirror_fqdn is defined

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

@ -1,4 +1,4 @@
# {{ ansible_managed }}
[easy_install]
index_url = {{ pypi_mirror }}
allow_hosts = {{ mirror_host }}
allow_hosts = {{ mirror_fqdn }}

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

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

4
roles/configure-mirrors/vars/ubuntu.yaml
View File

@ -1,2 +1,2 @@
wheel_mirror: "http://{{ mirror_host }}/wheel/{{ ansible_distribution | lower }}-{{ ansible_distribution_version }}-{{ ansible_architecture | lower }}"
package_mirror: "http://{{ mirror_host }}/ubuntu"
wheel_mirror: "http://{{ mirror_fqdn }}/wheel/{{ ansible_distribution | lower }}-{{ ansible_distribution_version }}-{{ ansible_architecture | lower }}"
package_mirror: "http://{{ mirror_fqdn }}/ubuntu"