openstack/puppet-openstack-integration
Code Issues Proposed changes

Update repos

Browse Source 
Since we're in queens and UCA now has a queens repo, let's switch to it.
Additionally renaming the RDO repo name to master to reflect that we're
actually testing master at the moment and switching dependencies repo to
master in RDO too.

Change-Id: Ic515c0ddd0f8809513a99c9ad70de5d10e35e378
This commit is contained in:
Alex Schultz 2017-12-21 10:36:27 -07:00 committed by Emilien Macchi
parent 8fea96515c
commit 70112e5f5f
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure_facts.sh
View File

@ -22,7 +22,7 @@ source $SCRIPT_DIR/functions
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"
DEPS_MIRROR_HOST="${NODEPOOL_RDO_PROXY}/centos7-master/deps/latest/"
if uses_debs; then
CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/ceph-deb-luminous"
else
@ -30,7 +30,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'
DEPS_MIRROR_HOST='https://trunk.rdoproject.org/centos7-master/deps/latest/'
NODEPOOL_RDO_PROXY='https://trunk.rdoproject.org'
NODEPOOL_UCA_MIRROR='http://ubuntu-cloud.archive.canonical.com/ubuntu'
if uses_debs; then
@ -49,14 +49,14 @@ RDO_MIRROR_HOST=${rdo_dlrn/https:\/\/trunk.rdoproject.org/$NODEPOOL_RDO_PROXY}
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_deps_mirror_host=$DEPS_MIRROR_HOST
export FACTER_ceph_mirror_host=$CEPH_MIRROR_HOST
export FACTER_rdo_mirror_host=$RDO_MIRROR_HOST
MIRROR_FACTS="\
centos_mirror_host=${FACTER_centos_mirror_host}
uca_mirror_host=${FACTER_uca_mirror_host}
buildlogs_mirror_host=${FACTER_buildlogs_mirror_host}
deps_mirror_host=${FACTER_deps_mirror_host}
ceph_mirror_host=${FACTER_ceph_mirror_host}
rdo_mirror_host=${FACTER_rdo_mirror_host}"

12
manifests/repos.pp
View File

@ -4,7 +4,7 @@ class openstack_integration::repos {
'Debian': {
include ::apt
class { '::openstack_extras::repo::debian::ubuntu':
release => 'pike',
release => 'queens',
package_require => true,
uca_location => pick($::uca_mirror_host, 'http://ubuntu-cloud.archive.canonical.com/ubuntu'),
}
@ -25,15 +25,15 @@ class openstack_integration::repos {
manage_epel => false,
centos_mirror_url => $::centos_mirror_host,
repo_hash => {
'pike-puppet-passed-ci' => {
'master-puppet-passed-ci' => {
'baseurl' => pick($::rdo_mirror_host, 'https://trunk.rdoproject.org/centos7-master/puppet-passed-ci/'),
'descr' => 'Pike puppet-passed-ci',
'descr' => 'master puppet-passed-ci',
'gpgcheck' => 'no',
'priority' => 1,
},
'pike-delorean-deps' => {
'baseurl' => pick($::buildlogs_mirror_host, 'https://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-pike'),
'descr' => 'Pike delorean-deps',
'master-delorean-deps' => {
'baseurl' => pick($::deps_mirror_host, 'https://trunk.rdoproject.org/centos7-master/deps/latest/'),
'descr' => 'master delorean-deps',
'gpgcheck' => 'no',
},
},