From 05e6980baa220ec17543ffda6f14e3fcf40f2e69 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 3 Aug 2017 14:49:13 -0400 Subject: [PATCH] Remove mirror_domain from configure-mirror 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 --- playbooks/unittests/pre.yaml | 1 - roles/configure-mirrors/README.rst | 4 ---- roles/configure-mirrors/templates/.pydistutils.cfg.j2 | 4 +--- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/playbooks/unittests/pre.yaml b/playbooks/unittests/pre.yaml index 77ded9800..1cce23bbb 100644 --- a/playbooks/unittests/pre.yaml +++ b/playbooks/unittests/pre.yaml @@ -3,7 +3,6 @@ - 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_domain: openstack.org - role: bindep bindep_profile: test bindep_dir: "{{ zuul_work_dir }}" diff --git a/roles/configure-mirrors/README.rst b/roles/configure-mirrors/README.rst index 6c5b25fdd..e4d70f8f4 100644 --- a/roles/configure-mirrors/README.rst +++ b/roles/configure-mirrors/README.rst @@ -5,9 +5,5 @@ Role Variables mirror_host 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 URL to override the generated pypi mirror url based on mirror_host diff --git a/roles/configure-mirrors/templates/.pydistutils.cfg.j2 b/roles/configure-mirrors/templates/.pydistutils.cfg.j2 index d92c8b74a..9f18c250a 100644 --- a/roles/configure-mirrors/templates/.pydistutils.cfg.j2 +++ b/roles/configure-mirrors/templates/.pydistutils.cfg.j2 @@ -1,6 +1,4 @@ # {{ ansible_managed }} [easy_install] index_url = {{ pypi_mirror }} -{% if mirror_domain is defined %} -allow_hosts = *.{{ mirror_domain }} -{% endif %} +allow_hosts = {{ mirror_host }}