move the CTDB_MANAGES_ISCSI setting from /etc/sysconfig/iscsi to /etc/sysconfig/ctdb

(This used to be ctdb commit a953a0fb450955b62d747bdc82c5b968fe0ed378)

diff --git a/ctdb/config/ctdb.sysconfig b/ctdb/config/ctdb.sysconfig
index 06110382a0c7c64b3d6a23c3f050ebb5d3745060..ded74791c1f8717f97125f91b16df76f965a90ed 100644 (file)
--- a/ctdb/config/ctdb.sysconfig
+++ b/ctdb/config/ctdb.sysconfig
@@ -49,6 +49,9 @@
 # should ctdb manage starting/stopping the VSFTPD service
 # CTDB_MANAGES_VSFTPD=yes
 
+# should ctdb manage starting/stopping the ISCSI service
+# CTDB_MANAGES_ISCSI=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/ctdb/config/events.d/70.iscsi b/ctdb/config/events.d/70.iscsi
index cd4355395ed4543c03f5ee8bdb618f3f1a39edd3..426e412d5107752ab83a40d06a312801d3f8f33e 100755 (executable)
--- a/ctdb/config/events.d/70.iscsi
+++ b/ctdb/config/events.d/70.iscsi
@@ -4,6 +4,7 @@
 PATH=/bin:/usr/bin:$PATH
 
 . $CTDB_BASE/functions
+loadconfig ctdb
 loadconfig iscsi
 
 cmd="$1"

diff --git a/ctdb/web/iscsi.html b/ctdb/web/iscsi.html
index 76409373ed047b5c03950c94d15c5969b1e2ef06..1385e18e60cbbe62dce2d13c9da77d71f1cd1830 100644 (file)
--- a/ctdb/web/iscsi.html
+++ b/ctdb/web/iscsi.html
@@ -41,17 +41,25 @@ onnode all chkconfig tgtd off
 Create this file and add the following three lines to it :
 
 <pre>
-   CTDB_MANAGES_ISCSI=yes
    CTDB_START_ISCSI_SCRIPTS=/gpfs/iscsi/
 </pre>
 
 <p>
-CTDB_MANAGES_ISCSI=yes just tells CTDB event script for iSCSI that CTDB should start and stop the iSCSI target service as required.
+CTDB_START_ISCSI_SCRIPTS=<directory on shared storage>
+This is a directory on shared storage where the scripts to start and configure the iscsi service are held. There is one script for each public address named <public address>.sh .
 </p>
 
+
+<h2>/etc/sysconfig/ctdb</h2>
+
+Add the following line to /etc/sysconfig/ctdb :
+
+<pre>
+   CTDB_MANAGES_ISCSI=yes
+</pre>
+
 <p>
-CTDB_START_ISCSI_SCRIPTS=<directory on shared storage>
-This is a directory on shared storage where the scripts to start and configure the iscsi service are held. There is one script for each public address named <public address>.sh .
+CTDB_MANAGES_ISCSI=yes just tells CTDB event script for iSCSI that CTDB should start and stop the iSCSI target service as required.
 </p>