From 005097530ac770c84510988ec40bc840c7ec48bf Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Wed, 27 Sep 2017 12:43:16 -0400
Subject: [PATCH] Add Ceph Luminous support for CentOS 7 CI

Change-Id: Idf3287b13d8a1508ad1dc3fad498a8eb0259ebf4
Depends-On: Ia5db0bcc884d47c918c7da6657aa5b9bfdcdce44
---
 configure_facts.sh | 4 ++--
 manifests/ceph.pp  | 8 +-------
 manifests/repos.pp | 2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/configure_facts.sh b/configure_facts.sh
index 606797657..9590d28e0 100644
--- a/configure_facts.sh
+++ b/configure_facts.sh
@@ -26,7 +26,7 @@ if [ -f /etc/ci/mirror_info.sh ]; then
     if uses_debs; then
         CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/ceph-deb-jewel"
     else
-        CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/7/storage/x86_64/ceph-jewel/"
+        CEPH_MIRROR_HOST="${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/storage/x86_64/ceph-luminous/"
     fi
 else
     CENTOS_MIRROR_HOST='http://mirror.centos.org'
@@ -36,7 +36,7 @@ else
     if uses_debs; then
         CEPH_MIRROR_HOST='https://download.ceph.com/debian-jewel'
     else
-        CEPH_MIRROR_HOST='http://mirror.centos.org/centos/7/storage/x86_64/ceph-jewel/'
+        CEPH_MIRROR_HOST='https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-luminous/'
     fi
 fi
 
diff --git a/manifests/ceph.pp b/manifests/ceph.pp
index d398e1a25..c77318a48 100644
--- a/manifests/ceph.pp
+++ b/manifests/ceph.pp
@@ -70,13 +70,7 @@ class openstack_integration::ceph (
   $ceph_pools = ['glance', 'nova', 'cinder', 'gnocchi']
   ceph::pool { $ceph_pools: }
 
-  # NOTE(mnaser): At the moment, the storage SIG packages do not ship 12.X
-  #               however UCA is shipping it at the moment.  This conditional
-  #               should be dropped once we switch CentOS to 12.X
-  if $::osfamily != 'RedHat' {
-    class { '::ceph::profile::mgr': }
-  }
-
+  class { '::ceph::profile::mgr': }
   class { '::ceph::profile::mon': }
   class { '::ceph::profile::osd': }
 
diff --git a/manifests/repos.pp b/manifests/repos.pp
index 43f99bbc7..ace929bf0 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -38,7 +38,7 @@ class openstack_integration::repos {
           },
         },
       }
-      $ceph_mirror = pick($::ceph_mirror_host, 'http://mirror.centos.org/centos/7/storage/x86_64/ceph-jewel/')
+      $ceph_mirror = pick($::ceph_mirror_host, 'https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-luminous/')
       # On CentOS, deploy Ceph using SIG repository and get rid of EPEL.
       # https://wiki.centos.org/SpecialInterestGroup/Storage/
       if $::operatingsystem == 'CentOS' {