summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorRamana Raja <rraja@redhat.com>2017-06-28 18:47:20 +0800
committerRamana Raja <rraja@redhat.com>2017-06-28 18:47:20 +0800
commitdeb07840475a73f0917ec22197f7872ac807b054 (patch)
treefcc4ea118428e9971d9b6a667eb9e0ba57503aed /devstack
parentff6bdd7454695f8a380698c8027f022e88b33e52 (diff)
manila: install latest luminous packages
... for cephfs-nfs driver Change-Id: I7d59ce288a245e7399b38020282be8e7c7fe62f7
Notes
Notes (review): Code-Review+2: Tom Barron <tpb@dyncloud.net> Workflow+1: Tom Barron <tpb@dyncloud.net> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 28 Jun 2017 12:31:52 +0000 Reviewed-on: https://review.openstack.org/478476 Project: openstack/devstack-plugin-ceph Branch: refs/heads/master
Diffstat (limited to 'devstack')
-rw-r--r--devstack/lib/ceph10
1 files changed, 4 insertions, 6 deletions
diff --git a/devstack/lib/ceph b/devstack/lib/ceph
index b77fa98..fa40f6f 100644
--- a/devstack/lib/ceph
+++ b/devstack/lib/ceph
@@ -840,10 +840,9 @@ function install_ceph {
840 if [ $os_CODENAME != 'xenial' ]; then 840 if [ $os_CODENAME != 'xenial' ]; then
841 die $LINENO "Need Ubuntu xenial to setup Manila with CephFS NFS-Ganesha driver" 841 die $LINENO "Need Ubuntu xenial to setup Manila with CephFS NFS-Ganesha driver"
842 fi 842 fi
843 # TODO(rraja): Switch to LTS luminous after spring 2017 release. 843 curl -L https://shaman.ceph.com/api/repos/ceph/luminous/latest/ubuntu/$os_CODENAME/repo | \
844 curl -L https://shaman.ceph.com/api/repos/ceph/kraken/latest/ubuntu/$os_CODENAME/repo | \
845 sudo tee /etc/apt/sources.list.d/ceph.list 844 sudo tee /etc/apt/sources.list.d/ceph.list
846 curl -L https://shaman.ceph.com/api/repos/nfs-ganesha/next/latest/ubuntu/$os_CODENAME/flavors/ceph_kraken/repo | \ 845 curl -L https://shaman.ceph.com/api/repos/nfs-ganesha/next/latest/ubuntu/$os_CODENAME/flavors/ceph_luminous/repo | \
847 sudo tee /etc/apt/sources.list.d/ext-nfs-ganesha.list 846 sudo tee /etc/apt/sources.list.d/ext-nfs-ganesha.list
848 CEPH_PACKAGES="${CEPH_PACKAGES} ceph-mds libcephfs2 nfs-ganesha nfs-ganesha-ceph" 847 CEPH_PACKAGES="${CEPH_PACKAGES} ceph-mds libcephfs2 nfs-ganesha nfs-ganesha-ceph"
849 else 848 else
@@ -895,10 +894,9 @@ function install_ceph {
895 if is_ceph_enabled_for_service manila; then 894 if is_ceph_enabled_for_service manila; then
896 if [ $MANILA_CEPH_DRIVER == 'cephfsnfs' ]; then 895 if [ $MANILA_CEPH_DRIVER == 'cephfsnfs' ]; then
897 if [ $DISTRO_TYPE == 'centos' ] && [ $RELEASE == 7 ]; then 896 if [ $DISTRO_TYPE == 'centos' ] && [ $RELEASE == 7 ]; then
898 # TODO(rraja): Switch to LTS luminous after spring 2017 release. 897 curl -L https://shaman.ceph.com/api/repos/ceph/luminous/latest/$DISTRO_TYPE/$RELEASE/repo | \
899 curl -L https://shaman.ceph.com/api/repos/ceph/kraken/latest/$DISTRO_TYPE/$RELEASE/repo | \
900 sudo tee /etc/yum.repos.d/ext-ceph.repo 898 sudo tee /etc/yum.repos.d/ext-ceph.repo
901 curl -L https://shaman.ceph.com/api/repos/nfs-ganesha/next/latest/$DISTRO_TYPE/$RELEASE/flavors/ceph_kraken/repo | \ 899 curl -L https://shaman.ceph.com/api/repos/nfs-ganesha/next/latest/$DISTRO_TYPE/$RELEASE/flavors/ceph_luminous/repo | \
902 sudo tee /etc/yum.repos.d/ext-ganesha.repo 900 sudo tee /etc/yum.repos.d/ext-ganesha.repo
903 fi 901 fi
904 CEPH_PACKAGES="${CEPH_PACKAGES} nfs-ganesha nfs-ganesha-ceph" 902 CEPH_PACKAGES="${CEPH_PACKAGES} nfs-ganesha nfs-ganesha-ceph"