Always use luminous for manila

Code Issues Proposed changes

Bring CentOS in line with ubuntu and use luminous rather than
jewel for all manila builds.
Change-Id: Ib0924e42551d25b68ee22ffb9b52caba302ac19c

This commit is contained in:

Tom Barron

2019年02月05日 05:20:25 -05:00

parent 2badb448e3

commit 74a88c0d3b

1 changed files with 3 additions and 8 deletions

@@ -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

}