openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Use Ceph release repos from CBS"

Browse Source
This commit is contained in:
Zuul 2019-11-26 22:15:56 +00:00 committed by Gerrit Code Review
commit 905bfd6fe1
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure_facts.sh
View File

@ -35,13 +35,11 @@ if [ -f /etc/ci/mirror_info.sh ]; then
CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/ceph-deb-${CEPH_VERSION}" CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/ceph-deb-${CEPH_VERSION}"
NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/apt-puppetlabs" NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/apt-puppetlabs"
else else
# TODO(tobasco): Remove this CBS candidate repo for Mimic and Nautilus when Storage SIG release it. # NOTE(tobias-urdin): Mimic was never released by Storage SIG to official mirros so we use CBS.
if [ "$CEPH_VERSION" == "mimic" ]; then if [ "$CEPH_VERSION" == "mimic" ]; then
CEPH_MIRROR_HOST='http://cbs.centos.org/repos/storage7-ceph-mimic-candidate/x86_64/os/' CEPH_MIRROR_HOST='http://cbs.centos.org/repos/storage7-ceph-mimic-release/x86_64/os/'
elif [ "$CEPH_VERSION" == "nautilus" ]; then
CEPH_MIRROR_HOST='http://cbs.centos.org/repos/storage7-ceph-nautilus-candidate/x86_64/os/'
else else
CEPH_MIRROR_HOST="${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/storage/x86_64/ceph-${CEPH_VERSION}/" CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/7/storage/x86_64/ceph-${CEPH_VERSION}/"
fi fi
NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/yum-puppetlabs" NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/yum-puppetlabs"
fi fi
@ -54,13 +52,11 @@ else
CEPH_MIRROR_HOST="https://download.ceph.com/debian-${CEPH_VERSION}" CEPH_MIRROR_HOST="https://download.ceph.com/debian-${CEPH_VERSION}"
NODEPOOL_PUPPETLABS_MIRROR='https://apt.puppetlabs.com' NODEPOOL_PUPPETLABS_MIRROR='https://apt.puppetlabs.com'
else else
# TODO(tobasco): Remove this CBS candidate repo for Mimic and Nautilus when Storage SIG releases it. # NOTE(tobias-urdin): Mimic was never released by Storage SIG to official mirros so we use CBS.
if [ "$CEPH_VERSION" == "mimic" ]; then if [ "$CEPH_VERSION" == "mimic" ]; then
CEPH_MIRROR_HOST='http://cbs.centos.org/repos/storage7-ceph-mimic-candidate/x86_64/os/' CEPH_MIRROR_HOST='http://cbs.centos.org/repos/storage7-ceph-mimic-release/x86_64/os/'
elif [ "$CEPH_VERSION" == "nautilus" ]; then
CEPH_MIRROR_HOST='http://cbs.centos.org/repos/storage7-ceph-nautilus-candidate/x86_64/os/'
else else
CEPH_MIRROR_HOST="https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-${CEPH_VERSION}/" CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/7/storage/x86_64/ceph-${CEPH_VERSION}/"
fi fi
NODEPOOL_PUPPETLABS_MIRROR="https://yum.puppetlabs.com" NODEPOOL_PUPPETLABS_MIRROR="https://yum.puppetlabs.com"
fi fi

7
manifests/repos.pp
View File

@ -65,11 +65,10 @@ class openstack_integration::repos {
}, },
}, },
} }
# TODO(tobasco): Remove this CBS candidate repo for Mimic and Nautilus when Storage SIG release it. # NOTE(tobias-urdin): Mimic was never released by Storage SIG to official mirros so we use CBS.
$ceph_mirror_fallback = $ceph_version_real ? { $ceph_mirror_fallback = $ceph_version_real ? {
'mimic' => 'http://cbs.centos.org/repos/storage7-ceph-mimic-candidate/x86_64/os/', 'mimic' => 'http://cbs.centos.org/repos/storage7-ceph-mimic-release/x86_64/os/',
'nautilus' => 'http://cbs.centos.org/repos/storage7-ceph-nautilus-candidate/x86_64/os/', default => "${::centos_mirror_host}/centos/7/storage/x86_64/ceph-${ceph_version_real}/"
default => "https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-${ceph_version_real}/"
} }
$ceph_mirror = pick($::ceph_mirror_host, $ceph_mirror_fallback) $ceph_mirror = pick($::ceph_mirror_host, $ceph_mirror_fallback)
# On CentOS, deploy Ceph using SIG repository and get rid of EPEL. # On CentOS, deploy Ceph using SIG repository and get rid of EPEL.