From bf3b3967f0ce20a09ca1b78d17d4c4cee9a5eb10 Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Wed, 8 Jan 2020 02:30:03 +0000
Subject: [PATCH] Revert "Fix setting custom mirror/pypi FQDNs for CI repro"

This reverts commit 849e2fe485f846d1d25d9da521a887d8bc88ceda.

Change-Id: I4e9d4a6a46c0a1541b7c440a2205c0f035875c4c
---
 .../templates/reproducer-quickstart.sh.j2              |  2 +-
 .../templates/launcher-playbook.yaml.j2                | 10 +++++-----
 .../templates/reproducer-zuul-based-quickstart.sh.j2   |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/roles/create-reproducer-script/templates/reproducer-quickstart.sh.j2 b/roles/create-reproducer-script/templates/reproducer-quickstart.sh.j2
index d71ace477..afe18298a 100644
--- a/roles/create-reproducer-script/templates/reproducer-quickstart.sh.j2
+++ b/roles/create-reproducer-script/templates/reproducer-quickstart.sh.j2
@@ -368,7 +368,7 @@ cat >>"{{ env_vars_to_source_file }}" <<EOF
 # Uncomment this if you have established docker proxy on virthost
 # export NODEPOOL_DOCKER_REGISTRY_PROXY=$NODEPOOL_DOCKER_REGISTRY_PROXY
 export NODEPOOL_CENTOS_MIRROR=$NODEPOOL_CENTOS_MIRROR
-export NODEPOOL_MIRROR_HOST={{ mirror_fqdn | default('mirror.mtl01.inap.openstack.org') }}
+export NODEPOOL_MIRROR_HOST=mirror.mtl01.inap.openstack.org
 EOF
 fi
 
diff --git a/roles/create-zuul-based-reproducer/templates/launcher-playbook.yaml.j2 b/roles/create-zuul-based-reproducer/templates/launcher-playbook.yaml.j2
index cc820b364..31637a40d 100644
--- a/roles/create-zuul-based-reproducer/templates/launcher-playbook.yaml.j2
+++ b/roles/create-zuul-based-reproducer/templates/launcher-playbook.yaml.j2
@@ -7,7 +7,7 @@
 # Clone https://github.com/openstack/tripleo-quickstart and run:
 # >> ansible-playbook launcher-playbook.yaml \
 #    -e nodepool_provider=libvirt \
-#    -e mirror_fqdn=mirror.mtl01.inap.openstack.org
+#    -e mirror_path=mirror.mtl01.inap.openstack.org
 #
 # To run on a different cloud defined in clouds.yaml ( default is rdo-cloud):
 # >> ansible-playbook launcher-playbook.yaml \
@@ -53,8 +53,7 @@
     clouds_yaml_path: "/home/{{ ansible_user }}/.config/openstack/clouds.yaml"
     {% endraw -%}
     ovb_key_name: tripleo-ci-team
-    mirror_fqdn: "{{ mirror_path | default(mirror_fqdn | default('mirror.regionone.rdo-cloud.rdoproject.org')) }}"
-    pypi_fqdn: "{{ pypi_fqdn | default(mirror_fqdn) }}"
+    mirror_path: mirror.regionone.rdo-cloud.rdoproject.org
     launch_job_branch: {{ zuul.branch }}
     {% if 'periodic' not in zuul.job -%}
     depends_on:
@@ -95,8 +94,9 @@
                 baremetal_image: CentOS-7-x86_64-GenericCloud-1804_02
             remove_ovb_after_job: false
             {% endif -%}
-            mirror_fqdn: "{{ mirror_fqdn | default('mirror.mtl01.inap.openstack.org') }}"
-            pypi_fqdn: "{{ pypi_fqdn | default(mirror_fqdn) }}"
+            {% raw -%}
+            mirror_fqdn: {{ mirror_path }}
+            {% endraw -%}
             {% if releases_file_output is defined -%}
             ready_releases_file: |
               {{ releases_file_output | replace('export', '  export') }}
diff --git a/roles/create-zuul-based-reproducer/templates/reproducer-zuul-based-quickstart.sh.j2 b/roles/create-zuul-based-reproducer/templates/reproducer-zuul-based-quickstart.sh.j2
index 723b01665..cdb9dc613 100644
--- a/roles/create-zuul-based-reproducer/templates/reproducer-zuul-based-quickstart.sh.j2
+++ b/roles/create-zuul-based-reproducer/templates/reproducer-zuul-based-quickstart.sh.j2
@@ -254,7 +254,7 @@ PATH=${HOME}/.local/bin:$PATH ansible-playbook \
 # Set the options selected into EXTRA_PARAMS
 if [[ "$LIBVIRT" == "1" ]]; then
     EXTRA_PARAMS="$EXTRA_PARAMS -e nodepool_provider=libvirt "
-    EXTRA_PARAMS="$EXTRA_PARAMS -e mirror_fqdn=mirror.mtl01.inap.openstack.org "
+    EXTRA_PARAMS="$EXTRA_PARAMS -e mirror_path=mirror.mtl01.inap.openstack.org "
 fi
 
 if [[ "$LIBVIRT" == "0" && "$CLOUD_NAME" != "rdo-cloud" ]]; then