Browse Source

Always use luminous for manila

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

Change-Id: Ib0924e42551d25b68ee22ffb9b52caba302ac19c
Tom Barron 2 months ago
parent
commit
74a88c0d3b
1 changed files with 3 additions and 8 deletions
  1. 3
    8
      devstack/lib/ceph

+ 3
- 8
devstack/lib/ceph View File

@@ -947,16 +947,11 @@ function setup_packages_for_manila_on_ubuntu {
947 947
 }
948 948
 
949 949
 function setup_packages_for_manila_on_fedora_family {
950
+    sudo yum -y remove centos-release-ceph-jewel
951
+    configure_repo_ceph "yum" "luminous" "${DISTRO_TYPE}" "${RELEASE}"
950 952
     if [ $MANILA_CEPH_DRIVER == 'cephfsnfs' ]; then
951
-        if [ $DISTRO_TYPE == 'centos' ]; then
952
-            configure_repo_ceph "yum" "luminous" "${DISTRO_TYPE}" "${RELEASE}"
953
-            configure_repo_nfsganesha "yum" "ceph_luminous" "${DISTRO_TYPE}" "${RELEASE}"
954
-        fi
953
+        configure_repo_nfsganesha "yum" "ceph_luminous" "${DISTRO_TYPE}" "${RELEASE}"
955 954
         CEPH_PACKAGES="${CEPH_PACKAGES} nfs-ganesha nfs-ganesha-ceph"
956
-    else
957
-        if [ $DISTRO_TYPE == 'centos' ]; then
958
-            configure_repo_ceph "yum" "jewel" "${DISTRO_TYPE}" "${RELEASE}"
959
-        fi
960 955
     fi
961 956
 }
962 957
 

Loading…
Cancel
Save