From ab778b3124699dc8f022dc8634e0b73b457c332e Mon Sep 17 00:00:00 2001 From: Tom Barron Date: Wed, 15 Mar 2017 14:16:44 -0400 Subject: [PATCH] devstack: skip nfs kernel install if nfs-ganesha 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 --- devstack/plugin.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 4c990c0f7a..0fcf5192cb 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -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