openstack/manila
Code Issues Proposed changes

devstack: skip nfs kernel install if nfs-ganesha

Browse Source 
is running under systemd since the services are incompatible.
Skip the samba install and startup as well since there is
no current use case for running samba plus nfs-ganesha.

TrivialFix

Change-Id: I6d6fe3a3babe2f7fcd9ca9461785ac413ff4ab2c
This commit is contained in:
Tom Barron 2017-03-15 14:16:44 -04:00
parent 00adc593fb
commit ab778b3124
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

@ -660,7 +660,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