Use UCA & centos AFS mirrors

Like we do in stable/mitaka, deploy AFS mirrors, for UCA too.

Change-Id: Ie21bb48f0cc7d1b33630b46aba73356a1cb3cb1b
Co-Authored-By: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Emilien Macchi 2016-07-08 09:16:25 -04:00
parent 66ee01b44c
commit 373fc20237
2 changed files with 8 additions and 3 deletions

View File

@ -6,13 +6,14 @@ class openstack_integration::repos {
class { '::openstack_extras::repo::debian::ubuntu':
release => 'liberty',
package_require => true,
uca_location => $::ubuntu_mirror_host,
}
$package_provider = 'apt'
}
'RedHat': {
class { '::openstack_extras::repo::redhat::redhat':
release => 'liberty',
centos_mirror_url => $::nodepool_mirror_host,
centos_mirror_url => $::centos_mirror_host,
}
package { 'openstack-selinux': ensure => 'latest' }
$package_provider = 'yum'

View File

@ -24,10 +24,14 @@ 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
NODEPOOL_MIRROR_HOST='mirror.centos.org'
CENTOS_MIRROR_HOST='mirror.centos.org'
UBUNTU_MIRROR_HOST='ubuntu-cloud.archive.canonical.com/ubuntu'
fi
export FACTER_nodepool_mirror_host="http://${NODEPOOL_MIRROR_HOST}"
export FACTER_centos_mirror_host="http://${CENTOS_MIRROR_HOST}"
export FACTER_ubuntu_mirror_host="http://${UBUNTU_MIRROR_HOST}"
if [ ! -f fixtures/${SCENARIO}.pp ]; then
echo "fixtures/${SCENARIO}.pp file does not exist. Please define a valid scenario."