From 4cdc670c5dbf770e6c0f5126783ac2239321fc60 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Sat, 23 Nov 2019 12:43:57 +0100
Subject: [PATCH] Use Ceph release repos from CBS

Change-Id: I7a133a2aee0df752763c9e06909cedf4a2d5e37c
---
 configure_facts.sh | 16 ++++++----------
 manifests/repos.pp |  7 +++----
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/configure_facts.sh b/configure_facts.sh
index e1a28eeeb..0ac683864 100644
--- a/configure_facts.sh
+++ b/configure_facts.sh
@@ -35,13 +35,11 @@ if [ -f /etc/ci/mirror_info.sh ]; then
         CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/ceph-deb-${CEPH_VERSION}"
         NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/apt-puppetlabs"
     else
-        # TODO(tobasco): Remove this CBS candidate repo for Mimic and Nautilus when Storage SIG release it.
+        # NOTE(tobias-urdin): Mimic was never released by Storage SIG to official mirros so we use CBS.
         if [ "$CEPH_VERSION" == "mimic" ]; then
-            CEPH_MIRROR_HOST='http://cbs.centos.org/repos/storage7-ceph-mimic-candidate/x86_64/os/'
-        elif [ "$CEPH_VERSION" == "nautilus" ]; then
-            CEPH_MIRROR_HOST='http://cbs.centos.org/repos/storage7-ceph-nautilus-candidate/x86_64/os/'
+            CEPH_MIRROR_HOST='http://cbs.centos.org/repos/storage7-ceph-mimic-release/x86_64/os/'
         else
-            CEPH_MIRROR_HOST="${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/storage/x86_64/ceph-${CEPH_VERSION}/"
+            CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/7/storage/x86_64/ceph-${CEPH_VERSION}/"
         fi
         NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/yum-puppetlabs"
     fi
@@ -54,13 +52,11 @@ else
         CEPH_MIRROR_HOST="https://download.ceph.com/debian-${CEPH_VERSION}"
         NODEPOOL_PUPPETLABS_MIRROR='https://apt.puppetlabs.com'
     else
-        # TODO(tobasco): Remove this CBS candidate repo for Mimic and Nautilus when Storage SIG releases it.
+        # NOTE(tobias-urdin): Mimic was never released by Storage SIG to official mirros so we use CBS.
         if [ "$CEPH_VERSION" == "mimic" ]; then
-            CEPH_MIRROR_HOST='http://cbs.centos.org/repos/storage7-ceph-mimic-candidate/x86_64/os/'
-        elif [ "$CEPH_VERSION" == "nautilus" ]; then
-            CEPH_MIRROR_HOST='http://cbs.centos.org/repos/storage7-ceph-nautilus-candidate/x86_64/os/'
+            CEPH_MIRROR_HOST='http://cbs.centos.org/repos/storage7-ceph-mimic-release/x86_64/os/'
         else
-            CEPH_MIRROR_HOST="https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-${CEPH_VERSION}/"
+            CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/7/storage/x86_64/ceph-${CEPH_VERSION}/"
         fi
         NODEPOOL_PUPPETLABS_MIRROR="https://yum.puppetlabs.com"
     fi
diff --git a/manifests/repos.pp b/manifests/repos.pp
index 0e2a628ee..b2c240a8b 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -65,11 +65,10 @@ class openstack_integration::repos {
           },
         },
       }
-      # TODO(tobasco): Remove this CBS candidate repo for Mimic and Nautilus when Storage SIG release it.
+      # NOTE(tobias-urdin): Mimic was never released by Storage SIG to official mirros so we use CBS.
       $ceph_mirror_fallback = $ceph_version_real ? {
-        'mimic'    => 'http://cbs.centos.org/repos/storage7-ceph-mimic-candidate/x86_64/os/',
-        'nautilus' => 'http://cbs.centos.org/repos/storage7-ceph-nautilus-candidate/x86_64/os/',
-        default    => "https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-${ceph_version_real}/"
+        'mimic' => 'http://cbs.centos.org/repos/storage7-ceph-mimic-release/x86_64/os/',
+        default => "${::centos_mirror_host}/centos/7/storage/x86_64/ceph-${ceph_version_real}/"
       }
       $ceph_mirror = pick($::ceph_mirror_host, $ceph_mirror_fallback)
       # On CentOS, deploy Ceph using SIG repository and get rid of EPEL.