manila: install Ceph for Ubuntu trusty or xenial

Code Issues Proposed changes

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

This commit is contained in:

Ramana Raja

2017年03月19日 17:56:18 +05:30

parent 6d01a64e1d

commit ed24ed385d

2 changed files with 5 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2
README.md

View File

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

5
devstack/lib/ceph

View File

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