eventscripts: Deprecate NFS_SERVER_MODE, use CTDB_NFS_SERVER_MODE instead

All CTDB configuration variables should start with CTDB_.

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/config/events.d/60.ganesha b/config/events.d/60.ganesha
index 70c4cdbc0da6ec6bcce5b30c9379944655b605a3..aa7db90b8cd7a633b6d8a7c96cb3122cae908069 100755 (executable)
--- a/config/events.d/60.ganesha
+++ b/config/events.d/60.ganesha
@@ -40,7 +40,7 @@ loadconfig "nfs"
 
 service_name="nfs-ganesha-$CTDB_CLUSTER_FILESYSTEM_TYPE"
 
-[ "$NFS_SERVER_MODE" = "ganesha" ] || exit 0
+[ "${CTDB_NFS_SERVER_MODE:-${NFS_SERVER_MODE}}" = "ganesha" ] || exit 0
 
 ctdb_setup_service_state_dir
 

diff --git a/config/events.d/60.nfs b/config/events.d/60.nfs
index 53f78dfe3d5cfd355627387368bfc1814fd83a02..bd6cc7f400acebde627277b1ee071a4ae35e498d 100755 (executable)
--- a/config/events.d/60.nfs
+++ b/config/events.d/60.nfs
@@ -51,7 +51,7 @@ nfs_check_thread_count ()
 
 loadconfig
 
-[ "$NFS_SERVER_MODE" != "ganesha" ] || exit 0
+[ "${CTDB_NFS_SERVER_MODE:-${NFS_SERVER_MODE}}" != "ganesha" ] || exit 0
 
 ctdb_setup_service_state_dir
 

diff --git a/config/statd-callout b/config/statd-callout
index 94bd2dd7fbd90217642613fdef52849cf9e31f0d..cd259c6a2937f11ee135023285aef465bd71ea65 100755 (executable)
--- a/config/statd-callout
+++ b/config/statd-callout
@@ -139,7 +139,7 @@ case "$1" in
        # will respond "strangely" immediately after restarting it, which
        # causes clients to fail to reclaim the locks.
        # 
-       if [ "$NFS_SERVER_MODE" != "ganesha" ] ; then
+       if [ "${CTDB_NFS_SERVER_MODE:-${NFS_SERVER_MODE}}" != "ganesha" ] ; then
             startstop_nfslock stop >/dev/null 2>&1
             sleep 2
             startstop_nfslock start >/dev/null 2>&1

diff --git a/tests/eventscripts/scripts/local.sh b/tests/eventscripts/scripts/local.sh
index a522e788979bc05ec86703e8428fc47917fc2cbb..450396a491df1b850e3103f2fc8d3ce382825361 100644 (file)
--- a/tests/eventscripts/scripts/local.sh
+++ b/tests/eventscripts/scripts/local.sh
@@ -644,7 +644,7 @@ setup_nfs ()
 setup_nfs_ganesha ()
 {
     setup_nfs "$@"
-    export NFS_SERVER_MODE="ganesha"
+    export CTDB_NFS_SERVER_MODE="ganesha"
     if [ "$1" != "down" ] ; then
        export CTDB_MANAGES_NFS="yes"
     fi