openstack/puppet-openstack-integration
Code Issues Proposed changes

Add bits to use AFS mirrors

Browse Source 
Like we do in stable branches, deploy AFS mirrors.
For now, use it only for UCA.

Change-Id: I6574f5b1f99e6ae8021cff68949173c6cbba6960
Co-Authored-By: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Emilien Macchi 2016-07-08 09:13:40 -04:00
parent aa90eb3b7c
commit a8ae335fd9
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/repos.pp
View File

@ -14,6 +14,7 @@ class openstack_integration::repos {
release => 'newton',
repo => 'updates',
package_require => true,
uca_location => $::ubuntu_mirror_host,
}
}
# Ceph is both packaged on UCA & ceph.com

14
run_tests.sh
View File

@ -21,6 +21,20 @@ export PUPPET_ARGS="${PUPPET_ARGS} --detailed-exitcodes --color=false --test --t
export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
export DISTRO=$(lsb_release -c -s)
# NOTE(pabelanger): Setup facter to know about AFS mirror.
if [ -f /etc/nodepool/provider ]; then
source /etc/nodepool/provider
NODEPOOL_MIRROR_HOST=${NODEPOOL_MIRROR_HOST:-mirror.$NODEPOOL_REGION.$NODEPOOL_CLOUD.openstack.org}
NODEPOOL_MIRROR_HOST=$(echo $NODEPOOL_MIRROR_HOST|tr '[:upper:]' '[:lower:]')
CENTOS_MIRROR_HOST=${NODEPOOL_MIRROR_HOST}
UBUNTU_MIRROR_HOST="${NODEPOOL_MIRROR_HOST}/ubuntu-cloud-archive"
else
CENTOS_MIRROR_HOST='mirror.centos.org'
UBUNTU_MIRROR_HOST='ubuntu-cloud.archive.canonical.com/ubuntu'
fi
export FACTER_centos_mirror_host="http://${CENTOS_MIRROR_HOST}"
export FACTER_ubuntu_mirror_host="http://${UBUNTU_MIRROR_HOST}"
if [ $PUPPET_MAJ_VERSION == 4 ]; then
export PATH=${PATH}:/opt/puppetlabs/bin
export PUPPET_RELEASE_FILE=puppetlabs-release-pc1