cluster: STABLE3 - cman: allow init script to pass options to fenced
Fabio M. Di Nitto
fabbione at fedoraproject.org
Fri Jul 23 14:14:28 UTC 2010
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=4500cb07c10baa701234656bbf11d8037d276111
Commit: 4500cb07c10baa701234656bbf11d8037d276111
Parent: 84f906bf8ea3d3a5ae44e1ae8cbf6919672a6e62
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
AuthorDate: Fri Jul 23 16:13:31 2010 +0200
Committer: Fabio M. Di Nitto <fdinitto at redhat.com>
CommitterDate: Fri Jul 23 16:13:31 2010 +0200
cman: allow init script to pass options to fenced
Use FENCED_OPTS to pass startup options to fenced
Resolves: rhbz#617566
Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
cman/init.d/cman.in | 5 ++++-
cman/init.d/cman.init.defaults.in | 3 +++
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index 10b4822..06703f4 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -122,6 +122,9 @@ fi
# to join the fence domain (equivalent to "yes").
[ -z "$FENCE_JOIN" ] && FENCE_JOIN="yes"
+# FENCED_OPTS -- allow extra options to be passed to fence daemon.
+[ -z "$FENCED_OPTS" ] && FENCED_OPTS=""
+
# NETWORK_BRIDGE_SCRIPT -- script to use for xen network bridging.
# This script must exist in the /etc/xen/scripts directory.
# The default script is "network-bridge".
@@ -630,7 +633,7 @@ stop_groupd()
start_fenced()
{
- start_daemon fenced
+ start_daemon fenced "$FENCED_OPTS"
}
stop_fenced()
diff --git a/cman/init.d/cman.init.defaults.in b/cman/init.d/cman.init.defaults.in
index 1f031b8..390e855 100644
--- a/cman/init.d/cman.init.defaults.in
+++ b/cman/init.d/cman.init.defaults.in
@@ -49,6 +49,9 @@
# to join the fence domain (equivalent to "yes").
#FENCE_JOIN="yes"
+# FENCED_OPTS -- allow extra options to be passed to fence daemon.
+#FENCED_OPTS=""
+
# NETWORK_BRIDGE_SCRIPT -- script to use for xen network bridging.
# This script must exist in the /etc/xen/scripts directory.
# The default script is "network-bridge".
More information about the cluster-commits
mailing list