openstack/puppet-openstack-integration
Code Issues Proposed changes

Ceph: Use centos-8-stream instead of centos-8

Browse Source 
Change-Id: I97995b6821a24b64edbc5b1e874ba67a0418f96a
This commit is contained in:
Takashi Kajinami 2022-02-02 17:21:22 +09:00
parent a031ed3f32
commit b2fa6c0e7b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure_facts.sh
View File

@ -44,7 +44,7 @@ if [ -f /etc/ci/mirror_info.sh ]; then
if [ "${OS_NAME_VERS}" == "centos9" ]; then if [ "${OS_NAME_VERS}" == "centos9" ]; then
CEPH_MIRROR_HOST="https://buildlogs.centos.org/centos/9-stream/storage/x86_64/ceph-${CEPH_VERSION}/" CEPH_MIRROR_HOST="https://buildlogs.centos.org/centos/9-stream/storage/x86_64/ceph-${CEPH_VERSION}/"
else else
CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/${VERSION_ID}/storage/x86_64/ceph-${CEPH_VERSION}/" CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/${VERSION_ID}-stream/storage/x86_64/ceph-${CEPH_VERSION}/"
NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/yum-puppetlabs" NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/yum-puppetlabs"
fi fi
fi fi

2
manifests/repos.pp
View File

@ -85,7 +85,7 @@ class openstack_integration::repos {
repo_replace => false, repo_replace => false,
update_packages => true, update_packages => true,
} }
$ceph_mirror_fallback = "${centos_mirror}/centos/${::os['release']['major']}/storage/x86_64/ceph-${ceph_version_real}/" $ceph_mirror_fallback = "${centos_mirror}/centos/${::os['release']['major']}-stream/storage/x86_64/ceph-${ceph_version_real}/"
if defined('$::ceph_mirror_host') and $::ceph_mirror_host != '' { if defined('$::ceph_mirror_host') and $::ceph_mirror_host != '' {
$ceph_mirror = pick($::ceph_mirror_host, $ceph_mirror_fallback) $ceph_mirror = pick($::ceph_mirror_host, $ceph_mirror_fallback)
} else { } else {