openstack
/
manila
Code Issues Proposed changes

Merge "devstack: skip nfs kernel install if nfs-ganesha"

This commit is contained in:
Jenkins 2017-04-08 04:07:20 +00:00 committed by Gerrit Code Review
parent d54f16067c ab778b3124
commit fddb11eb74
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/plugin.sh
View File

@ -659,7 +659,10 @@ function install_manila {
setup_develop $MANILA_DIR
if is_service_enabled m-shr; then
_install_nfs_and_samba
if [[ ! $(systemctl is-active nfs-ganesha.service) == 'active' ]]; then
_install_nfs_and_samba
fi
if [ "$SHARE_DRIVER" == "manila.share.drivers.zfsonlinux.driver.ZFSonLinuxShareDriver" ]; then
if [[ $(sudo zfs list &> /dev/null && sudo zpool list &> /dev/null || echo 'absent') == 'absent' ]]; then