Replace CBS mash repositories for mimic by mirror in RDO

Code Issues Proposed changes

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

This commit is contained in:

Alfredo Moralejo

2020年03月24日 13:16:49 +01:00

parent 481da8ec63

commit 6da1dd3f17

2 changed files with 3 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

4
configure_facts.sh

View File

@@ -38,7 +38,7 @@ if [ -f /etc/ci/mirror_info.sh ]; then

else

# TODO(tobasco): Remove this CBS candidate repo for Mimic when Storage SIG release it.

if [ "$CEPH_VERSION" == "mimic" ]; then

CEPH_MIRROR_HOST='http://cbs.centos.org/repos/storage7-ceph-mimic-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}/"

fi

@@ -55,7 +55,7 @@ else

else

# TODO(tobasco): Remove this CBS candidate repo for Mimic when Storage SIG releases it.

if [ "$CEPH_VERSION" == "mimic" ]; then

CEPH_MIRROR_HOST='http://cbs.centos.org/repos/storage7-ceph-mimic-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}/"

fi

2
manifests/repos.pp

View File

@@ -67,7 +67,7 @@ class openstack_integration::repos {

}

#TODO(tobasco):RemovethisCBScandidaterepoforMimicwhenStorageSIGreleaseit.

$ceph_mirror_fallback=$ceph_version_real?{

'mimic' => 'http://cbs.centos.org/repos/storage7-ceph-mimic-candidate/x86_64/os/',

'mimic' => 'https://trunk.rdoproject.org/centos7/deps/storage/storage7-ceph-mimic/x86_64/'

default => "https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-${ceph_version_real}/"

}

$ceph_mirror=pick($::ceph_mirror_host,$ceph_mirror_fallback)