openstack/deb-manila
Code Issues Proposed changes

Make nfs-kernel-server run on a clean host

Browse Source 
nfsd refuses to start on a host with empty /etc/exports. This
change adds a workaround for affected first-party drivers.

Change-Id: If62fdc4219ceb02455bc55c717b7f2c7f34b0dca
Closes-Bug: 1616061
This commit is contained in:
Alexey Ovchinnikov 2016-09-16 11:56:17 +03:00
parent 16c522bf5e
commit a2ce6c0aa3
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
devstack/plugin.sh
View File

@ -603,6 +603,23 @@ function init_manila {
rm -f $MANILA_AUTH_CACHE_DIR/* rm -f $MANILA_AUTH_CACHE_DIR/*
} }
# check_nfs_kernel_service_state_ubuntu- Make sure nfsd is running
function check_nfs_kernel_service_state_ubuntu {
# (aovchinnikov): Workaround for nfs-utils bug 1052264
if [ ! sudo service nfs-kernel-server status | grep "nfsd running" -eq 0 ]; then
echo "Apparently nfsd is not running. Trying to fix that."
sudo mkdir -p "/media/nfsdonubuntuhelper"
# (aovchinnikov): shell wrapping is needed for cases when a file to be written
# is owned by root.
sudo sh -c "echo '/media/nfsdonubuntuhelper 127.0.0.1(ro)' >> /etc/exports"
sudo service nfs-kernel-server start
fi
if [ ! sudo service nfs-kernel-server status | grep "nfsd running" -eq 0 ]; then
echo "Failed to start nfsd. Exiting."
exit 1
fi
}
# install_manila - Collect source and prepare # install_manila - Collect source and prepare
function install_manila { function install_manila {
git_clone $MANILACLIENT_REPO $MANILACLIENT_DIR $MANILACLIENT_BRANCH git_clone $MANILACLIENT_REPO $MANILACLIENT_DIR $MANILACLIENT_BRANCH
@ -613,6 +630,7 @@ function install_manila {
if is_service_enabled m-shr; then if is_service_enabled m-shr; then
if is_ubuntu; then if is_ubuntu; then
install_package nfs-kernel-server nfs-common samba install_package nfs-kernel-server nfs-common samba
check_nfs_kernel_service_state_ubuntu
elif is_fedora; then elif is_fedora; then
install_package nfs-utils nfs-utils-lib samba install_package nfs-utils nfs-utils-lib samba
elif is_suse; then elif is_suse; then
@ -639,6 +657,8 @@ function install_manila {
sudo apt-get install -y build-essential sudo apt-get install -y build-essential
sudo apt-get install -y ubuntu-zfs sudo apt-get install -y ubuntu-zfs
sudo modprobe zfs sudo modprobe zfs
check_nfs_kernel_service_state_ubuntu
else else
echo "Manila Devstack plugin does not support installation "\ echo "Manila Devstack plugin does not support installation "\
"of ZFS packages for non-'Ubuntu-trusty' distros. "\ "of ZFS packages for non-'Ubuntu-trusty' distros. "\