commit 32b6f75c49a91a17fa0c9c114849be886a284480
Author: Takashi Kajinami <tkajinam@redhat.com>
Date:   Wed Aug 26 19:09:22 2020 +0900

    [Ussuri Only] Cleanup workaround for CentOS7
    
    This patch removes some workarounds, which were introduced because of
    missing ussuri release on CentOS7 in RDO project, since CentOS7 is
    no longer used in beaker tests.
    
    Change-Id: Idbb6a51292c7c238cce808bc467899ab83166971

diff --git a/configure_facts.sh b/configure_facts.sh
index 9a69ce4..fa5508a 100644
--- a/configure_facts.sh
+++ b/configure_facts.sh
@@ -18,18 +18,10 @@ OS_NAME_VERS=${REDHAT_SUPPORT_PRODUCT}${REDHAT_SUPPORT_PRODUCT_VERSION}
 
 # Write out facts to the facter folder when we generate them.
 export WRITE_FACTS=${WRITE_FACTS:-true}
-if [ "${OS_NAME_VERS}" == "centos7" ]; then
-  # TODO(tkajinam): Remove this once we get rid of centos7 beaker job
-  export DLRN_BASE=${DLRN_BASE:-${OS_NAME_VERS}-master/puppet-passed-ci}
-  export DLRN_DEPS_BASE=${DLRN_DEPS_BASE:-${OS_NAME_VERS}-master/deps/latest/}
-  export DLRN_BASE_URL=${DLRN_BASE_URL:-${OS_NAME_VERS}-master/puppet-passed-ci/delorean.repo}
-  export DLRN_DEPS_URL=${DLRN_DEPS_URL:-${OS_NAME_VERS}-master/delorean-deps.repo}
-else
-  export DLRN_BASE=${DLRN_BASE:-${OS_NAME_VERS}-ussuri/current-passed-ci/}
-  export DLRN_DEPS_BASE=${DLRN_DEPS_BASE:-${OS_NAME_VERS}-ussuri/deps/latest/}
-  export DLRN_BASE_URL=${DLRN_BASE_URL:-${OS_NAME_VERS}-ussuri/current-passed-ci/delorean.repo}
-  export DLRN_DEPS_URL=${DLRN_DEPS_URL:-${OS_NAME_VERS}-ussuri/delorean-deps.repo}
-fi
+export DLRN_BASE=${DLRN_BASE:-${OS_NAME_VERS}-ussuri/current-passed-ci/}
+export DLRN_DEPS_BASE=${DLRN_DEPS_BASE:-${OS_NAME_VERS}-ussuri/deps/latest/}
+export DLRN_BASE_URL=${DLRN_BASE_URL:-${OS_NAME_VERS}-ussuri/current-passed-ci/delorean.repo}
+export DLRN_DEPS_URL=${DLRN_DEPS_URL:-${OS_NAME_VERS}-ussuri/delorean-deps.repo}
 export CEPH_VERSION=${CEPH_VERSION:-nautilus}
 
 export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
diff --git a/manifests/repos.pp b/manifests/repos.pp
index 0100dfe..5509d19 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -47,20 +47,13 @@ class openstack_integration::repos {
       $ceph_mirror = pick($::ceph_mirror_host, "http://download.ceph.com/debian-${ceph_version_real}/")
     }
     'RedHat': {
-      if versioncmp($::os['release']['major'], '8') < 0 {
-        $release   = 'master'
-        $namespace = 'puppet-passed-ci'
-      } else {
-        $release   = 'ussuri'
-        $namespace = 'current-passed-ci'
-      }
       class { 'openstack_extras::repo::redhat::redhat':
         manage_rdo        => false,
         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"
         },
         update_packages   => true,
       }