openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Revert "Fix setting custom mirror/pypi FQDNs for CI repro"

Browse Source 
This reverts commit 849e2fe485.

Change-Id: I4e9d4a6a46c0a1541b7c440a2205c0f035875c4c
This commit is contained in:
Steve Baker 2020-01-08 02:30:03 +00:00
parent 849e2fe485
commit bf3b3967f0
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/create-reproducer-script/templates/reproducer-quickstart.sh.j2
View File

@ -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

10
roles/create-zuul-based-reproducer/templates/launcher-playbook.yaml.j2
View File

@ -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') }}

2
roles/create-zuul-based-reproducer/templates/reproducer-zuul-based-quickstart.sh.j2
View File

@ -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