move CTDB_MANAGES_NFS from /etc/sysconfig/nfs to /etc/sysconfig/ctdb

diff --git a/config/ctdb.sysconfig b/config/ctdb.sysconfig
index ded74791c1f8717f97125f91b16df76f965a90ed..25b3f28cab2e8b70f0172aeb960fe1b721c9f835 100644 (file)
--- a/config/ctdb.sysconfig
+++ b/config/ctdb.sysconfig
@@ -52,6 +52,9 @@
 # should ctdb manage starting/stopping the ISCSI service
 # CTDB_MANAGES_ISCSI=yes
 
+# should ctdb manage starting/stopping the NFS service
+# CTDB_MANAGES_NFS=yes
+
 
 # you may wish to raise the file descriptor limit for ctdb
 # use a ulimit command here. ctdb needs one file descriptor per

diff --git a/config/events.d/60.nfs b/config/events.d/60.nfs
index 5aaf6936a274bdd4b23ae0d3ff633c263ea73fc1..c62eed38f5334366ec681d251abe85c32a0a7fe1 100755 (executable)
--- a/config/events.d/60.nfs
+++ b/config/events.d/60.nfs
@@ -2,6 +2,7 @@
 # script to manage nfs in a clustered environment
 
 . $CTDB_BASE/functions
+loadconfig ctdb
 loadconfig nfs
 
 [ "$CTDB_MANAGES_NFS" = "yes" ] || exit 0

diff --git a/config/events.d/61.nfstickle b/config/events.d/61.nfstickle
index ab33cf11c2bdcdb153dbafbc2415c27dabd8643e..53355951f542a3c77464ec7d5aba8a4c5a82c99a 100755 (executable)
--- a/config/events.d/61.nfstickle
+++ b/config/events.d/61.nfstickle
@@ -4,6 +4,7 @@
 PATH=/bin:/usr/bin:$PATH
 
 . $CTDB_BASE/functions
+loadconfig ctdb
 loadconfig nfs
 
 cmd="$1"

diff --git a/web/nfs.html b/web/nfs.html
index ef10d0d794cf669f26f75cac058fae6f56ed154a..f5b626c0b4c681df3b63d99cd197e8bcc84ab491 100644 (file)
--- a/web/nfs.html
+++ b/web/nfs.html
@@ -39,7 +39,6 @@ which causes problems on some clients.<br>
 
 This file should look something like :
 <pre>
-  CTDB_MANAGES_NFS=yes
   NFS_TICKLE_SHARED_DIRECTORY=/gpfs0/nfs-tickles
   STATD_SHARED_DIRECTORY=/gpfs0/nfs-state
   NFS_HOSTNAME=ctdb
@@ -54,10 +53,6 @@ This file should look something like :
 
 </pre>
 
-The CTDB_MANAGES_NFS line tells the events scripts that CTDB is to manage startup and shutdown of the NFS and NFSLOCK services.<br>
-
-With this set to yes, CTDB will start/stop/restart these services as required.<br><br>
-
 You need to make sure that the lock manager runs on the same port on all nodes in the cluster since some clients will have "issues" and take very long to recover if the port suddenly changes.<br>
 599 above is only an example. You can run the lock manager on any available port as long as you use the same port on all nodes.<br><br>
 
@@ -83,6 +78,16 @@ Always use the same name here as you use for the samba hostname.
 
 RPCNFSDARGS is used to disable support for NFSv4 which is not yet supported by CTDB.
 
+<h2>/etc/sysconfig/ctdb</h2>
+Add the following line to /etc/sysconfig/ctdb :
+
+<pre>
+  CTDB_MANAGES_NFS=yes
+</pre>
+The CTDB_MANAGES_NFS line tells the events scripts that CTDB is to manage startup and shutdown of the NFS and NFSLOCK services.<br>
+
+With this set to yes, CTDB will start/stop/restart these services as required.<br><br>
+
 
 <h2>chkconfig</h2>