openstack/puppet-openstack-integration
Code Issues Proposed changes

Add Ceph Nautilus support

Browse Source 
Adds support to set the jobs to use Ceph
Nautilus when testing.

Change-Id: Ibf2b82435a0f9c29d363c67a973399228bfb90a3
This commit is contained in:
Tobias Urdin 2019-04-04 14:35:41 +02:00
parent 165c6fa58d
commit 0ccadc01ed
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure_facts.sh
View File

@ -35,9 +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 when Storage SIG release it. # TODO(tobasco): Remove this CBS candidate repo for Mimic and Nautilus when Storage SIG release it.
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-candidate/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="${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/storage/x86_64/ceph-${CEPH_VERSION}/"
fi fi
@ -52,9 +54,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 when Storage SIG releases it. # TODO(tobasco): Remove this CBS candidate repo for Mimic and Nautilus when Storage SIG releases it.
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-candidate/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="https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-${CEPH_VERSION}/"
fi fi

2
functions
View File

@ -24,7 +24,7 @@ install_openstack() {
ZUUL_BRANCH=${ZUUL_BRANCH:-master} ZUUL_BRANCH=${ZUUL_BRANCH:-master}
if [ "$ZUUL_PROJECT" != "openstack/puppet-ceph" ] && [ -n "$CEPH_VERSION" ]; then if [ "$ZUUL_PROJECT" != "openstack/puppet-ceph" ] && [ -n "$CEPH_VERSION" ]; then
if [ "$CEPH_VERSION" == "mimic" ]; then if [ "$CEPH_VERSION" == "nautilus" ]; then
ZUUL_BRANCH="master" ZUUL_BRANCH="master"
else else
ZUUL_BRANCH="stable/$CEPH_VERSION" ZUUL_BRANCH="stable/$CEPH_VERSION"

7
manifests/repos.pp
View File

@ -65,10 +65,11 @@ class openstack_integration::repos {
}, },
}, },
} }
# TODO(tobasco): Remove this CBS candidate repo for Mimic when Storage SIG release it. # TODO(tobasco): Remove this CBS candidate repo for Mimic and Nautilus when Storage SIG release it.
$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-candidate/x86_64/os/',
default => "https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-${ceph_version_real}/" 'nautilus' => 'http://cbs.centos.org/repos/storage7-ceph-nautilus-candidate/x86_64/os/',
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.