From 1e826f1a9d818c1ebb6d7a3b946a4bfb87bd249f Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 15 May 2020 13:20:24 +1000 Subject: [PATCH] site-variables: remove opendev.org mirror switch There are no more openstack.org mirrors; so remove this matching and just use opendev.org always. Change-Id: Iabf2f2d77b6403f664963559c220893ffbbef5bb --- zuul/site-variables.yaml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/zuul/site-variables.yaml b/zuul/site-variables.yaml index 91dbe99d00..f4aab4e737 100644 --- a/zuul/site-variables.yaml +++ b/zuul/site-variables.yaml @@ -1,14 +1,6 @@ # This file contains ansible variables that are used by our zuul-executors. --- -# NOTE(ianw): 2019-05 this list of clouds will grow as we provision -# new opendev.org based mirrors, but then eventually be removed once -# all are updated. -zuul_site_mirror_fqdn: >- - {%- if nodepool.region + "." + nodepool.cloud in [ "DFW.rax", "IAD.rax", "ORD.rax", "us-east.openedge", "BHS1.ovh", "GRA1.ovh", "mtl01.inap", "RegionOne.linaro-us", "Kna1.airship-citycloud", "sjc1.vexxhost", "ca-ymq-1.vexxhost", "RegionOne.limestone" ] -%} - mirror.{{ nodepool.region | lower }}.{{ nodepool.cloud | lower }}.opendev.org - {%- else -%} - mirror.{{ nodepool.region | lower }}.{{ nodepool.cloud | lower }}.openstack.org - {%- endif -%} +zuul_site_mirror_fqdn: mirror.{{ nodepool.region | lower }}.{{ nodepool.cloud | lower }}.opendev.org zuul_site_traceroute_host: opendev.org zuul_site_image_manifest_files: - /etc/dib-builddate.txt