openstack/deb-manila
Code Issues Proposed changes

Merge "Fix check for nfsd presence"

Browse Source
This commit is contained in:
Jenkins 2016-09-26 13:23:02 +00:00 committed by Gerrit Code Review
commit e34d9f52ba
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/plugin.sh
View File

@ -606,7 +606,7 @@ function init_manila {
# 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
if [[ $(sudo service nfs-kernel-server status | grep -c "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
@ -614,7 +614,7 @@ function check_nfs_kernel_service_state_ubuntu {
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
if [[ $(sudo service nfs-kernel-server status | grep -c "nfsd running") -eq 0 ]]; then
echo "Failed to start nfsd. Exiting."
exit 1
fi