From ed24ed385ded3c11238d6172c9db8f02cf07418e Mon Sep 17 00:00:00 2001 From: Ramana Raja Date: Sun, 19 Mar 2017 17:56:18 +0530 Subject: [PATCH] manila: install Ceph for Ubuntu trusty or xenial When setting up Manila with CephFS in Ubuntu machines, don't always install Ceph packages for xenial. Allow installation of Ceph packages for trusty in Ubuntu trusty machines. Change-Id: I70d26a3db2034331c8101795b432831718a15273 --- README.md | 2 +- devstack/lib/ceph | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6ba3078..d7c54bd 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ This plugin also gets used to configure Ceph as the storage backend for the upst * Tempest test failures when using RGW as swift endpoint * Tempest fails due to verify-tempest-config erroring out, when using RGW as swift endpoint * Patch sent @ https://review.openstack.org/#/c/264179/ - +* Manila with CephFS - for Ubuntu, support only for trusty and xenial # TODOs diff --git a/devstack/lib/ceph b/devstack/lib/ceph index 490d607..8eac925 100644 --- a/devstack/lib/ceph +++ b/devstack/lib/ceph @@ -800,12 +800,15 @@ function install_ceph { install_package software-properties-common if is_ceph_enabled_for_service manila; then + if ! [[ $os_CODENAME =~ (xenial|trusty) ]]; then + die $LINENO "Need Ubuntu trusty or xenial to setup Manila with CephFS" + fi # The 'apt' package manager needs the following package to access # HTTPS enabled repositories such as the Ceph repos hosted by the # shaman/chacra system. install_package apt-transport-https - curl -L https://shaman.ceph.com/api/repos/ceph/jewel/latest/ubuntu/xenial/repo | \ + curl -L https://shaman.ceph.com/api/repos/ceph/jewel/latest/ubuntu/$os_CODENAME/repo | \ sudo tee /etc/apt/sources.list.d/ceph.list CEPH_PACKAGES="${CEPH_PACKAGES} ceph-mds libcephfs1"