From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7977 invoked by alias); 15 May 2009 06:07:22 -0000 Received: (qmail 7971 invoked by alias); 15 May 2009 06:07:21 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - cman init: add support for join and leave options To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 6c4dea2b599fc9f461a7e1063f36a772c8e7d15f X-Git-Newrev: b11739b572d52d03e6ddddea07e62600fcf191c5 From: "Fabio M. Di Nitto" Message-Id: <20090515060655.52E8812026F@lists.fedorahosted.org> Date: Fri, 15 May 2009 06:07:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00325.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=b11739b572d52d03e6ddddea07e62600fcf191c5 Commit: b11739b572d52d03e6ddddea07e62600fcf191c5 Parent: 6c4dea2b599fc9f461a7e1063f36a772c8e7d15f Author: Fabio M. Di Nitto AuthorDate: Fri May 15 08:05:36 2009 +0200 Committer: Fabio M. Di Nitto CommitterDate: Fri May 15 08:05:36 2009 +0200 cman init: add support for join and leave options Some users might require special cman_tool options on join and leave operations. Add support via /etc/sysconfig/cman or distro equivalent using CMAN_JOIN_OPTS and CMAN_LEAVE_OPTS config options. Signed-off-by: Fabio M. Di Nitto --- cman/init.d/cman.in | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index 38c3fbb..fb12d3b 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -122,7 +122,16 @@ fi # The default script is "network-bridge". [ -z "$NETWORK_BRIDGE_SCRIPT" ] && NETWORK_BRIDGE_SCRIPT="network-bridge" -[ -n "$CLUSTERNAME" ] && cman_join_opts="-c $CLUSTERNAME" +# CMAN_JOIN_OPTS -- allows extra options to be passed to cman_tool when join +# operation is performed. +# NOTES: +# $CLUSTERNAME automatically appends "-c $CLUSTERNAME" +# $NODENAME automatically appends "-n $NODENAME" +# $CONFIG_LOADER automatically appends "-C $CONFIG_LOADER" + +[ -n "$CMAN_JOIN_OPTS" ] && cman_join_opts="$CMAN_JOIN_OPTS" + +[ -n "$CLUSTERNAME" ] && cman_join_opts+="-c $CLUSTERNAME" [ -n "$NODENAME" ] && cman_join_opts+=" -n $NODENAME" @@ -139,6 +148,10 @@ fi # openaisparser - use internal openais config file parser. [ -n "$CONFIG_LOADER" ] && cman_join_opts+=" -C $CONFIG_LOADER" +# CMAN_LEAVE_OPTS -- allows extra options to be passed to cman_tool when leave +# operation is performed. +[ -n "$CMAN_LEAVE_OPTS" ] && cman_leave_opts="$CMAN_LEAVE_OPTS" + # INITLOGLEVEL -- select how verbose the init script should be # possible values: # quiet - only one line notification for start/stop operations @@ -477,7 +490,7 @@ start_cman() stop_cman() { if cman_running; then - errmsg=$( cman_tool -t $CMAN_SHUTDOWN_TIMEOUT \ + errmsg=$( cman_tool $cman_leave_opts -t $CMAN_SHUTDOWN_TIMEOUT \ -w leave $cmanremove 2>&1 ) || return 1 fi }