openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Switch Ceph to point to Luminous mirrors on Ubuntu"

Browse Source
This commit is contained in:
Zuul 2017-12-01 23:28:30 +00:00 committed by Gerrit Code Review
commit 2176cb50d1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure_facts.sh
View File

@ -24,7 +24,7 @@ if [ -f /etc/ci/mirror_info.sh ]; then
CENTOS_MIRROR_HOST="http://${NODEPOOL_MIRROR_HOST}" CENTOS_MIRROR_HOST="http://${NODEPOOL_MIRROR_HOST}"
BUILDLOGS_MIRROR_HOST="${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/cloud/x86_64/openstack-pike" BUILDLOGS_MIRROR_HOST="${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/cloud/x86_64/openstack-pike"
if uses_debs; then if uses_debs; then
CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/ceph-deb-jewel" CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/ceph-deb-luminous"
else else
CEPH_MIRROR_HOST="${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/storage/x86_64/ceph-luminous/" CEPH_MIRROR_HOST="${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/storage/x86_64/ceph-luminous/"
fi fi
@ -34,7 +34,7 @@ else
NODEPOOL_RDO_PROXY='https://trunk.rdoproject.org' NODEPOOL_RDO_PROXY='https://trunk.rdoproject.org'
NODEPOOL_UCA_MIRROR='http://ubuntu-cloud.archive.canonical.com/ubuntu' NODEPOOL_UCA_MIRROR='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-luminous'
else else
CEPH_MIRROR_HOST='https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-luminous/' CEPH_MIRROR_HOST='https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-luminous/'
fi fi

2
manifests/repos.pp
View File

@ -17,7 +17,7 @@ class openstack_integration::repos {
} }
$enable_sig = false $enable_sig = false
$enable_epel = false $enable_epel = false
$ceph_mirror = pick($::ceph_mirror_host, 'http://download.ceph.com/debian-jewel/') $ceph_mirror = pick($::ceph_mirror_host, 'http://download.ceph.com/debian-luminous/')
} }
'RedHat': { 'RedHat': {
class { '::openstack_extras::repo::redhat::redhat': class { '::openstack_extras::repo::redhat::redhat':