openstack/puppet-openstack-integration
Code Issues Proposed changes

Deploy buildlogs from OpenStack Infra mirrors

Browse Source 
Following the efforts to use more mirrors, this one is for using
buildlogs mirrors from OpenStack Infra, so we don't rely on centos.org
infra anymore from now.

Change-Id: I6c4db33f246aaa037b774b8af5ebf99d04022658
This commit is contained in:
Emilien Macchi 2017-08-02 14:02:45 -07:00
parent 262fd71213
commit f9e13fb381
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/repos.pp
View File

@ -32,7 +32,7 @@ class openstack_integration::repos {
'priority' => 1,
},
'pike-delorean-deps' => {
'baseurl' => 'https://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-pike',
'baseurl' => pick($::buildlogs_mirror_host, 'https://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-pike'),
'descr' => 'Pike delorean-deps',
'gpgcheck' => 'no',
},

3
run_tests.sh
View File

@ -43,6 +43,7 @@ RDO_MIRROR_HOST=`curl --silent https://trunk.rdoproject.org/centos7-master/puppe
if [ -f /etc/ci/mirror_info.sh ]; then
source /etc/ci/mirror_info.sh
CENTOS_MIRROR_HOST="http://${NODEPOOL_MIRROR_HOST}"
BUILDLOGS_MIRROR_HOST="${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/cloud/x86_64/openstack-pike"
RDO_MIRROR_HOST=${RDO_MIRROR_HOST/https:\/\/trunk.rdoproject.org/$NODEPOOL_MIRROR_HOST:8080/rdo}
if uses_debs; then
CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/ceph-deb-jewel"
@ -51,6 +52,7 @@ if [ -f /etc/ci/mirror_info.sh ]; then
fi
else
CENTOS_MIRROR_HOST='http://mirror.centos.org'
BUILDLOGS_MIRROR_HOST='https://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-pike'
if uses_debs; then
CEPH_MIRROR_HOST='https://download.ceph.com/debian-jewel'
else
@ -59,6 +61,7 @@ else
fi
export FACTER_centos_mirror_host=$CENTOS_MIRROR_HOST
export FACTER_uca_mirror_host=$NODEPOOL_UCA_MIRROR
export FACTER_buildlogs_mirror_host=$BUILDLOGS_MIRROR_HOST
export FACTER_ceph_mirror_host=$CEPH_MIRROR_HOST
export FACTER_rdo_mirror_host="http://${RDO_MIRROR_HOST}"