From 3a946ee48d169088130019d166cee6793f845c8c Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Tue, 24 Mar 2020 13:16:49 +0100 Subject: [PATCH] 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 6da1dd3f17a0ad6bb1a356706eccb302aad91f06) --- configure_facts.sh | 8 ++++---- manifests/repos.pp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure_facts.sh b/configure_facts.sh index 83da2d6c4..70dd26c42 100644 --- a/configure_facts.sh +++ b/configure_facts.sh @@ -40,9 +40,9 @@ 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 so we use CBS. + # 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-release/x86_64/os/' + CEPH_MIRROR_HOST='https://trunk.rdoproject.org/centos7/deps/storage/storage7-ceph-mimic/x86_64/' else CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/7/storage/x86_64/ceph-${CEPH_VERSION}/" fi @@ -57,9 +57,9 @@ 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 so we use CBS. + # 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-release/x86_64/os/' + CEPH_MIRROR_HOST='https://trunk.rdoproject.org/centos7/deps/storage/storage7-ceph-mimic/x86_64/' else CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/7/storage/x86_64/ceph-${CEPH_VERSION}/" fi diff --git a/manifests/repos.pp b/manifests/repos.pp index 98bc8ec0b..75688a806 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -65,9 +65,9 @@ class openstack_integration::repos { }, }, } - # NOTE(tobias-urdin): Mimic was never released by Storage SIG to official mirros so we use CBS. + # 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-release/x86_64/os/', + '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)