diff --git a/configure_facts.sh b/configure_facts.sh index ddf32e1c5..5135aa85d 100644 --- a/configure_facts.sh +++ b/configure_facts.sh @@ -44,12 +44,7 @@ if [ -f /etc/ci/mirror_info.sh ]; then fi NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/apt-puppetlabs" else - # NOTE(tobias-urdin): Mimic was never released by Storage SIG to official mirros. - if [ "$CEPH_VERSION" == "mimic" ]; then - CEPH_MIRROR_HOST="https://trunk.rdoproject.org/centos${REDHAT_SUPPORT_PRODUCT_VERSION}/deps/storage/storage${REDHAT_SUPPORT_PRODUCT_VERSION}-ceph-mimic/x86_64/" - else - CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/${REDHAT_SUPPORT_PRODUCT_VERSION}/storage/x86_64/ceph-${CEPH_VERSION}/" - fi + CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/${REDHAT_SUPPORT_PRODUCT_VERSION}/storage/x86_64/ceph-${CEPH_VERSION}/" NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/yum-puppetlabs" fi else @@ -61,12 +56,7 @@ 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. - if [ "$CEPH_VERSION" == "mimic" ]; then - CEPH_MIRROR_HOST="https://trunk.rdoproject.org/centos${REDHAT_SUPPORT_PRODUCT_VERSION}/deps/storage/storage${REDHAT_SUPPORT_PRODUCT_VERSION}-ceph-mimic/x86_64/" - else - CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/${REDHAT_SUPPORT_PRODUCT_VERSION}/storage/x86_64/ceph-${CEPH_VERSION}/" - fi + CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/${REDHAT_SUPPORT_PRODUCT_VERSION}/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 c0c2f6533..ff1ef20ca 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -76,11 +76,7 @@ class openstack_integration::repos { repo_replace => false, update_packages => true, } - # NOTE(tobias-urdin): Mimic was never released by Storage SIG to official mirros. - $ceph_mirror_fallback = $ceph_version_real ? { - 'mimic' => "https://trunk.rdoproject.org/centos${::os['release']['major']}/deps/storage/storage${::os['release']['major']}-ceph-mimic/x86_64/", - default => "${centos_mirror}/centos/${::os['release']['major']}/storage/x86_64/ceph-${ceph_version_real}/" - } + $ceph_mirror_fallback = "${centos_mirror}/centos/${::os['release']['major']}/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 {