From 3fb0cf9761b02b89eeb193a482c16ab0d2067a68 Mon Sep 17 00:00:00 2001 From: Varsha Rao Date: Tue, 24 Mar 2020 15:26:51 +0530 Subject: [PATCH] vstart: Use random port instead of default Ganesha port Signed-off-by: Varsha Rao (cherry picked from commit 91334cb8eab1f6eb203f74267ead141747780696) --- src/vstart.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/vstart.sh b/src/vstart.sh index 97fe1accab426..eea258ccaa8a2 100755 --- a/src/vstart.sh +++ b/src/vstart.sh @@ -1065,15 +1065,14 @@ EOF # https://launchpad.net/~nfs-ganesha/+archive/ubuntu/nfs-ganesha-2.7 start_ganesha() { - #GANESHA_PORT=$(($CEPH_PORT + 4000)) + GANESHA_PORT=$(($CEPH_PORT + 4000)) local ganesha=0 for name in a b c d e f g h i j k l m n o p do [ $ganesha -eq $GANESHA_DAEMON_NUM ] && break - #port=$(($GANESHA_PORT + ganesha)) - port=2049 + port=$(($GANESHA_PORT + ganesha)) ganesha=$(($ganesha + 1)) ganesha_dir="$CEPH_DEV_DIR/ganesha.$name" @@ -1083,7 +1082,14 @@ start_ganesha() { keyring=$(ceph_adm auth print-key client.ganesha-tester) prun $SUDO "$CEPH_BIN/ceph-authtool" --name=client.ganesha-tester --add-key=$keyring keyring - echo "%url rados://nfs-ganesha/tester/a" > "$ganesha_dir/ganesha.conf" + echo "%url rados://nfs-ganesha/tester/a + +NFS_CORE_PARAM { + Enable_NLM = false; + Enable_RQUOTA = false; + Protocols = 4; + NFS_Port = $port; +}" > "$ganesha_dir/ganesha.conf" wconf <