openstack
/
puppet-openstack-integration
Code Issues Proposed changes

Replace CBS mash repositories for mimic by mirror in RDO 

CBS mash repositories are being removed by CentOS team [1]. Actually it
was never a good practice to consume them directly although in some
cases was needed because of issus publishing packages.

[1] https://lists.centos.org/pipermail/centos-devel/2020-March/036679.html

Change-Id: I42fde8356757f0a100a549072834bc97dd0768bf
(cherry picked from commit 6da1dd3f17)
(cherry picked from commit 3ded600873)
This commit is contained in:
Alfredo Moralejo 2020-03-24 13:16:49 +01:00
parent c70816b9eb
commit 5868e286fb
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}"
NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/apt-puppetlabs"
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.
if [ "$CEPH_VERSION" == "mimic" ]; then
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/'
CEPH_MIRROR_HOST='https://trunk.rdoproject.org/centos7/deps/storage/storage7-ceph-mimic/x86_64/'
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
NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/yum-puppetlabs"
fi
@ -54,13 +52,11 @@ else
CEPH_MIRROR_HOST="https://download.ceph.com/debian-${CEPH_VERSION}"
NODEPOOL_PUPPETLABS_MIRROR='https://apt.puppetlabs.com'
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.
if [ "$CEPH_VERSION" == "mimic" ]; then
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/'
CEPH_MIRROR_HOST='https://trunk.rdoproject.org/centos7/deps/storage/storage7-ceph-mimic/x86_64/'
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
NODEPOOL_PUPPETLABS_MIRROR="https://yum.puppetlabs.com"
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.
$ceph_mirror_fallback = $ceph_version_real ? {
'mimic' => 'http://cbs.centos.org/repos/storage7-ceph-mimic-candidate/x86_64/os/',
'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}/"
'mimic' => 'https://trunk.rdoproject.org/centos7/deps/storage/storage7-ceph-mimic/x86_64/',
default => "${::centos_mirror_host}/centos/7/storage/x86_64/ceph-${ceph_version_real}/"
}
$ceph_mirror = pick($::ceph_mirror_host, $ceph_mirror_fallback)
# On CentOS, deploy Ceph using SIG repository and get rid of EPEL.