commit 4e5f43078b73a9c87617695e9f442b68943a2ddf Merge: 528f679 32b6f75 Author: Zuul Date: Wed Oct 14 01:29:38 2020 +0000 Merge "[Ussuri Only] Cleanup workaround for CentOS7" into stable/ussuri diff --cc manifests/repos.pp index fbf3d30,5509d19..7912cd6 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@@ -59,10 -52,9 +52,10 @@@ class openstack_integration::repos manage_epel => false, centos_mirror_url => $::centos_mirror_host, repo_source_hash => { - 'delorean.repo' => "https://trunk.rdoproject.org/centos${::os['release']['major']}-${release}/${namespace}/delorean.repo", - 'delorean-deps.repo' => "https://trunk.rdoproject.org/centos${::os['release']['major']}-${release}/delorean-deps.repo" + 'delorean.repo' => "https://trunk.rdoproject.org/centos${::os['release']['major']}-ussuri/current-passed-ci/delorean.repo", + 'delorean-deps.repo' => "https://trunk.rdoproject.org/centos${::os['release']['major']}-ussuri/delorean-deps.repo" }, + repo_replace => false, update_packages => true, } # NOTE(tobias-urdin): Mimic was never released by Storage SIG to official mirros.