openstack
/
tripleo-quickstart
Code Issues Proposed changes

Use proxy with trunk.rdoproject.org if available 

Change-Id: Iba94235b47d2ee8ae916e5fc1701bd5e16affd6c
This commit is contained in:
Sagi Shnaidman 2019-08-18 14:34:52 +03:00
parent ec61b56821
commit deaf686519
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
roles/repo-setup/tasks/get-dlrn-hash-newest.yml
View File

@ -16,11 +16,17 @@
block:
- name: Get DLRN hash newest - passed tag
shell: >
curl -s {{ dlrn_baseurl }}/{{ dlrn_hash_tag_newest }}/delorean.repo \
shell: |
dlrn_base={{ dlrn_baseurl }}
if [ -e /etc/ci/mirror_info.sh ]; then
source /etc/ci/mirror_info.sh
NODEPOOL_RDO_PROXY=${NODEPOOL_RDO_PROXY:-https://trunk.rdoproject.org}
dlrn_base=${dlrn_base/https:\/\/trunk.rdoproject.org/$NODEPOOL_RDO_PROXY}
fi
curl -s ${dlrn_base}/{{ dlrn_hash_tag_newest }}/delorean.repo \
| grep baseurl | grep -Eo '[a-zA-Z0-9]{40}_[a-zA-Z0-9]{8}'
register: full_hash_newest_result
retries: 3
retries: 5
- name: Set fact for dlrn_hash_newest
set_fact:

24
roles/repo-setup/tasks/get-dlrn-hash.yml
View File

@ -16,11 +16,17 @@
block:
- name: Get DLRN hash - passed tag
shell: >
curl -s {{ dlrn_baseurl }}/{{ dlrn_hash_tag }}/delorean.repo \
shell: |
dlrn_base={{ dlrn_baseurl }}
if [ -e /etc/ci/mirror_info.sh ]; then
source /etc/ci/mirror_info.sh
NODEPOOL_RDO_PROXY=${NODEPOOL_RDO_PROXY:-https://trunk.rdoproject.org}
dlrn_base=${dlrn_base/https:\/\/trunk.rdoproject.org/$NODEPOOL_RDO_PROXY}
fi
curl -s ${dlrn_base}/{{ dlrn_hash_tag }}/delorean.repo \
| grep baseurl | grep -Eo '[a-zA-Z0-9]{40}_[a-zA-Z0-9]{8}'
register: full_hash_result
retries: 3
retries: 5
- name: Set fact for dlrn_hash
set_fact:
@ -32,11 +38,17 @@
block:
- name: Get DLRN overcloud hash
shell: >
curl -s https://trunk.rdoproject.org/centos7-{{ overcloud_release }}/{{ dlrn_hash_tag }}/delorean.repo \
shell: |
dlrn_base=https://trunk.rdoproject.org/centos7-{{ overcloud_release }}
if [ -e /etc/ci/mirror_info.sh ]; then
source /etc/ci/mirror_info.sh
NODEPOOL_RDO_PROXY=${NODEPOOL_RDO_PROXY:-https://trunk.rdoproject.org}
dlrn_base=${dlrn_base/https:\/\/trunk.rdoproject.org/$NODEPOOL_RDO_PROXY}
fi
curl -s ${dlrn_base}/{{ dlrn_hash_tag }}/delorean.repo \
| grep baseurl | grep -Eo '[a-zA-Z0-9]{40}_[a-zA-Z0-9]{8}'
register: full_overcloud_hash_result
retries: 3
retries: 5
- name: Set fact for overcloud dlrn_hash
set_fact: