From b2fa6c0e7bb6d5e319cd820484c120d043f58ab2 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 2 Feb 2022 17:21:22 +0900 Subject: [PATCH] Ceph: Use centos-8-stream instead of centos-8 Change-Id: I97995b6821a24b64edbc5b1e874ba67a0418f96a --- configure_facts.sh | 2 +- manifests/repos.pp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure_facts.sh b/configure_facts.sh index 85e3d7f69..55d375570 100644 --- a/configure_facts.sh +++ b/configure_facts.sh @@ -44,7 +44,7 @@ if [ -f /etc/ci/mirror_info.sh ]; then if [ "${OS_NAME_VERS}" == "centos9" ]; then CEPH_MIRROR_HOST="https://buildlogs.centos.org/centos/9-stream/storage/x86_64/ceph-${CEPH_VERSION}/" 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" fi fi diff --git a/manifests/repos.pp b/manifests/repos.pp index 4637c235c..428c5a767 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -85,7 +85,7 @@ class openstack_integration::repos { repo_replace => false, 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 != '' { $ceph_mirror = pick($::ceph_mirror_host, $ceph_mirror_fallback) } else {