Remove logic to use Ceph mimic on CentOS
... because we now use nautilus in our CI. Change-Id: I4d253c4880b263c1b138dd817eec105d5445ce49
This commit is contained in:
parent
108f9a0bad
commit
a86df63869
@ -40,12 +40,7 @@ if [ -f /etc/ci/mirror_info.sh ]; then
|
||||
CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/ceph-deb-${CEPH_VERSION}"
|
||||
NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/apt-puppetlabs"
|
||||
else
|
||||
# NOTE(tobias-urdin): Mimic was never released by Storage SIG to official mirros.
|
||||
if [ "$CEPH_VERSION" == "mimic" ]; then
|
||||
CEPH_MIRROR_HOST="https://trunk.rdoproject.org/centos${REDHAT_SUPPORT_PRODUCT_VERSION}/deps/storage/storage${REDHAT_SUPPORT_PRODUCT_VERSION}-ceph-mimic/x86_64/"
|
||||
else
|
||||
CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/${REDHAT_SUPPORT_PRODUCT_VERSION}/storage/x86_64/ceph-${CEPH_VERSION}/"
|
||||
fi
|
||||
CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/${REDHAT_SUPPORT_PRODUCT_VERSION}/storage/x86_64/ceph-${CEPH_VERSION}/"
|
||||
NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/yum-puppetlabs"
|
||||
fi
|
||||
else
|
||||
@ -57,12 +52,7 @@ else
|
||||
CEPH_MIRROR_HOST="https://download.ceph.com/debian-${CEPH_VERSION}"
|
||||
NODEPOOL_PUPPETLABS_MIRROR='https://apt.puppetlabs.com'
|
||||
else
|
||||
# NOTE(tobias-urdin): Mimic was never released by Storage SIG to official mirros.
|
||||
if [ "$CEPH_VERSION" == "mimic" ]; then
|
||||
CEPH_MIRROR_HOST="https://trunk.rdoproject.org/centos${REDHAT_SUPPORT_PRODUCT_VERSION}/deps/storage/storage${REDHAT_SUPPORT_PRODUCT_VERSION}-ceph-mimic/x86_64/"
|
||||
else
|
||||
CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/${REDHAT_SUPPORT_PRODUCT_VERSION}/storage/x86_64/ceph-${CEPH_VERSION}/"
|
||||
fi
|
||||
CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/${REDHAT_SUPPORT_PRODUCT_VERSION}/storage/x86_64/ceph-${CEPH_VERSION}/"
|
||||
NODEPOOL_PUPPETLABS_MIRROR="https://yum.puppetlabs.com"
|
||||
fi
|
||||
fi
|
||||
|
@ -63,11 +63,7 @@ class openstack_integration::repos {
|
||||
repo_replace => false,
|
||||
update_packages => true,
|
||||
}
|
||||
# NOTE(tobias-urdin): Mimic was never released by Storage SIG to official mirros.
|
||||
$ceph_mirror_fallback = $ceph_version_real ? {
|
||||
'mimic' => "https://trunk.rdoproject.org/centos${::os['release']['major']}/deps/storage/storage${::os['release']['major']}-ceph-mimic/x86_64/",
|
||||
default => "${centos_mirror}/centos/${::os['release']['major']}/storage/x86_64/ceph-${ceph_version_real}/"
|
||||
}
|
||||
$ceph_mirror_fallback = "${centos_mirror}/centos/${::os['release']['major']}/storage/x86_64/ceph-${ceph_version_real}/"
|
||||
if defined('$::ceph_mirror_host') and $::ceph_mirror_host != '' {
|
||||
$ceph_mirror = pick($::ceph_mirror_host, $ceph_mirror_fallback)
|
||||
} else {
|
||||
|
Loading…
Reference in New Issue
Block a user