From 0c22a613358423ec84a23beb6c8c3d6471115c4e Mon Sep 17 00:00:00 2001 From: Tom Barron Date: Tue, 6 Aug 2019 14:22:22 -0400 Subject: [PATCH] Skip NFS/Samba install for CephFS Today we either expose the CephFS back end via the CephFS native protocol, in which case kernel NFS and Samba are not needed, or by NFS-Ganesha, in which case Samba is not needed and kernel NFS is incompatible (we just turn it off again later). In the future someone could develop support for exposing CephFS via Samba so we'd add specific checks for that then and install Samba. Change-Id: Id65ce2536a3deb32a04a70bd0c49081297741965 --- devstack/plugin.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index facb1f3a2b..de1a1aab7a 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -716,8 +716,10 @@ function install_manila { if is_service_enabled m-shr; then - if [[ ! $(systemctl is-active nfs-ganesha.service) == 'active' ]]; then - _install_nfs_and_samba + if [[ ! $(systemctl is-active nfs-ganesha.service) == 'active' ]] ; then + if [ "$SHARE_DRIVER" != "manila.share.drivers.cephfs.driver.CephFSDriver" ] ; then + _install_nfs_and_samba + fi fi if [ "$SHARE_DRIVER" == "manila.share.drivers.zfsonlinux.driver.ZFSonLinuxShareDriver" ]; then