diff --git a/configure_facts.sh b/configure_facts.sh index 24e7988ea..eedb6477b 100644 --- a/configure_facts.sh +++ b/configure_facts.sh @@ -40,7 +40,7 @@ if [ -f /etc/ci/mirror_info.sh ]; then CEPH_MIRROR_HOST="http://download.ceph.com/debian-${CEPH_VERSION}" NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/apt-puppetlabs" 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 else @@ -52,7 +52,7 @@ else CEPH_MIRROR_HOST="https://download.ceph.com/debian-${CEPH_VERSION}" NODEPOOL_PUPPETLABS_MIRROR='https://apt.puppetlabs.com' 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="https://yum.puppetlabs.com" fi fi diff --git a/manifests/repos.pp b/manifests/repos.pp index 629d1f500..6d25d00c8 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -76,7 +76,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 {