openstack
/
manila-image-elements
Code Issues Proposed changes

Add support for CephFS Native 

Elements have been added to support mounting
Ceph file systems.

Change-Id: I7516ca10ea9ba2606185395e8f8cedf8304d46fb
This commit is contained in:
lkuchlan 2020-05-10 08:59:54 +03:00
parent c127687d3d
commit fa2177bdf6
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/manila-image-create
View File

@ -58,7 +58,7 @@ print_usage() {
echo "Usage: ${0##*/} [-s share-proto] [-d distro] [-h]" echo "Usage: ${0##*/} [-s share-proto] [-d distro] [-h]"
echo "Options:" echo "Options:"
echo " -s | --share-proto: name of the share protocol. \ echo " -s | --share-proto: name of the share protocol. \
Possible options are nfs, nfs-ganesha, cifs or zfs" Possible options are nfs, nfs-ganesha, cephfs, cifs or zfs"
echo " -d | --distro: name of the Linux distro. \ echo " -d | --distro: name of the Linux distro. \
Possible options are ubuntu or centos" Possible options are ubuntu or centos"
echo " -h | --help: print this usage message and exit" echo " -h | --help: print this usage message and exit"
@ -68,8 +68,9 @@ print_usage() {
valid_share_protocol() { valid_share_protocol() {
if [ "${MANILA_SHARE_PROTO}" != "nfs" ] && [ "${MANILA_SHARE_PROTO}" != "nfs-ganesha" ] && if [ "${MANILA_SHARE_PROTO}" != "nfs" ] && [ "${MANILA_SHARE_PROTO}" != "nfs-ganesha" ] &&
[ "${MANILA_SHARE_PROTO}" != "cifs" ] && [ "${MANILA_SHARE_PROTO}" != "zfs" ]; then [ "${MANILA_SHARE_PROTO}" != "cifs" ] && [ "${MANILA_SHARE_PROTO}" != "zfs" ] &&
err "Protocol ${MANILA_SHARE_PROTO} not supported. Valid options are nfs, nfs-ganesha, cifs or zfs." [ "${MANILA_SHARE_PROTO}" != "cephfs" ]; then
err "Protocol ${MANILA_SHARE_PROTO} not supported. Valid options are nfs, nfs-ganesha, cephfs, cifs or zfs."
exit 1 exit 1
fi fi
} }
@ -127,6 +128,8 @@ configure() {
OPTIONAL_ELEMENTS="$OPTIONAL_ELEMENTS ${MANILA_DISTRO}-cifs" OPTIONAL_ELEMENTS="$OPTIONAL_ELEMENTS ${MANILA_DISTRO}-cifs"
elif [ "$MANILA_SHARE_PROTO" = "zfs" ]; then elif [ "$MANILA_SHARE_PROTO" = "zfs" ]; then
OPTIONAL_ELEMENTS="$OPTIONAL_ELEMENTS ${MANILA_DISTRO}-zfs" OPTIONAL_ELEMENTS="$OPTIONAL_ELEMENTS ${MANILA_DISTRO}-zfs"
elif [ "$MANILA_SHARE_PROTO" = "cephfs" ]; then
OPTIONAL_ELEMENTS="$OPTIONAL_ELEMENTS ${MANILA_DISTRO}-cephfs"
fi fi
if [ "$USE_OFFLINE_MODE" = "yes" ]; then if [ "$USE_OFFLINE_MODE" = "yes" ]; then

5
elements/centos-cephfs/install.d/50-manila-cephfs Executable file
View File

@ -0,0 +1,5 @@
#!/usr/bin/env bash
set -eu
install-packages ceph-common ceph-fuse crudini

5
elements/ubuntu-cephfs/install.d/50-manila-cephfs Normal file
View File

@ -0,0 +1,5 @@
#!/usr/bin/env bash
set -eu
install-packages ceph-common ceph-fuse crudini