openstack/puppet-openstack-integration
Code Issues Proposed changes

Source /etc/ci/mirror_info.sh and get variables for free

Browse Source 
Instead of processing some variables, stop loading deprecated
/etc/nodepool/provider and use /etc/ci/mirror_info.sh to get some
variables for free.

Change-Id: Ic7c475eaa314ce2458ba2e9ca3f4683033bc2b64
This commit is contained in:
Emilien Macchi 2017-08-03 11:20:26 -07:00
parent 8b441fe60f
commit 262fd71213
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
run_tests.sh
View File

@ -40,22 +40,17 @@ export IMG_DIR=${IMG_DIR:-'/tmp/openstack/image'}
RDO_MIRROR_HOST=`curl --silent https://trunk.rdoproject.org/centos7-master/puppet-passed-ci/delorean.repo | grep baseurl | cut -d= -f2` RDO_MIRROR_HOST=`curl --silent https://trunk.rdoproject.org/centos7-master/puppet-passed-ci/delorean.repo | grep baseurl | cut -d= -f2`
# NOTE(pabelanger): Setup facter to know about AFS mirror. # NOTE(pabelanger): Setup facter to know about AFS mirror.
if [ -f /etc/nodepool/provider ]; then if [ -f /etc/ci/mirror_info.sh ]; then
source /etc/nodepool/provider source /etc/ci/mirror_info.sh
NODEPOOL_MIRROR_HOST=${NODEPOOL_MIRROR_HOST:-mirror.$NODEPOOL_REGION.$NODEPOOL_CLOUD.openstack.org} CENTOS_MIRROR_HOST="http://${NODEPOOL_MIRROR_HOST}"
# OpenStack Infra AFS mirrors don't support HTTPS yet.
NODEPOOL_MIRROR_HOST="http://$(echo $NODEPOOL_MIRROR_HOST|tr '[:upper:]' '[:lower:]')"
CENTOS_MIRROR_HOST=${NODEPOOL_MIRROR_HOST}
UCA_MIRROR_HOST="${NODEPOOL_MIRROR_HOST}/ubuntu-cloud-archive"
RDO_MIRROR_HOST=${RDO_MIRROR_HOST/https:\/\/trunk.rdoproject.org/$NODEPOOL_MIRROR_HOST:8080/rdo} RDO_MIRROR_HOST=${RDO_MIRROR_HOST/https:\/\/trunk.rdoproject.org/$NODEPOOL_MIRROR_HOST:8080/rdo}
if uses_debs; then if uses_debs; then
CEPH_MIRROR_HOST="${NODEPOOL_MIRROR_HOST}/ceph-deb-jewel" CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/ceph-deb-jewel"
else else
CEPH_MIRROR_HOST="${NODEPOOL_MIRROR_HOST}/centos/7/storage/x86_64/ceph-jewel/" CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/7/storage/x86_64/ceph-jewel/"
fi fi
else else
CENTOS_MIRROR_HOST='http://mirror.centos.org' CENTOS_MIRROR_HOST='http://mirror.centos.org'
UCA_MIRROR_HOST='http://ubuntu-cloud.archive.canonical.com/ubuntu'
if uses_debs; then if uses_debs; then
CEPH_MIRROR_HOST='https://download.ceph.com/debian-jewel' CEPH_MIRROR_HOST='https://download.ceph.com/debian-jewel'
else else
@ -63,9 +58,9 @@ else
fi fi
fi fi
export FACTER_centos_mirror_host=$CENTOS_MIRROR_HOST export FACTER_centos_mirror_host=$CENTOS_MIRROR_HOST
export FACTER_uca_mirror_host=$UCA_MIRROR_HOST export FACTER_uca_mirror_host=$NODEPOOL_UCA_MIRROR
export FACTER_ceph_mirror_host=$CEPH_MIRROR_HOST export FACTER_ceph_mirror_host=$CEPH_MIRROR_HOST
export FACTER_rdo_mirror_host=$RDO_MIRROR_HOST export FACTER_rdo_mirror_host="http://${RDO_MIRROR_HOST}"
if [ $PUPPET_MAJ_VERSION == 4 ]; then if [ $PUPPET_MAJ_VERSION == 4 ]; then
export PATH=${PATH}:/opt/puppetlabs/bin:/opt/puppetlabs/puppet/bin export PATH=${PATH}:/opt/puppetlabs/bin:/opt/puppetlabs/puppet/bin