diff --git a/manifests/repos.pp b/manifests/repos.pp index 1336e6919..c7278a2fc 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -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' diff --git a/run_tests.sh b/run_tests.sh index cebb8733d..38fb3d597 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -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."