From 74a88c0d3b902c8407e5cbf4cc3919b6585382e1 Mon Sep 17 00:00:00 2001
From: Tom Barron <tpb@dyncloud.net>
Date: Tue, 5 Feb 2019 05:20:25 -0500
Subject: [PATCH] Always use luminous for manila

Bring CentOS in line with ubuntu and use luminous rather than
jewel for all manila builds.

Change-Id: Ib0924e42551d25b68ee22ffb9b52caba302ac19c
---
 devstack/lib/ceph | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/devstack/lib/ceph b/devstack/lib/ceph
index 0e40c48..23cbed1 100755
--- a/devstack/lib/ceph
+++ b/devstack/lib/ceph
@@ -947,16 +947,11 @@ function setup_packages_for_manila_on_ubuntu {
 }
 
 function setup_packages_for_manila_on_fedora_family {
+    sudo yum -y remove centos-release-ceph-jewel
+    configure_repo_ceph "yum" "luminous" "${DISTRO_TYPE}" "${RELEASE}"
     if [ $MANILA_CEPH_DRIVER == 'cephfsnfs' ]; then
-        if [ $DISTRO_TYPE == 'centos' ]; then
-            configure_repo_ceph "yum" "luminous" "${DISTRO_TYPE}" "${RELEASE}"
-            configure_repo_nfsganesha "yum" "ceph_luminous" "${DISTRO_TYPE}" "${RELEASE}"
-        fi
+        configure_repo_nfsganesha "yum" "ceph_luminous" "${DISTRO_TYPE}" "${RELEASE}"
         CEPH_PACKAGES="${CEPH_PACKAGES} nfs-ganesha nfs-ganesha-ceph"
-    else
-        if [ $DISTRO_TYPE == 'centos' ]; then
-            configure_repo_ceph "yum" "jewel" "${DISTRO_TYPE}" "${RELEASE}"
-        fi
     fi
 }