From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 21 Mar 2007 17:18:07 -0000
Subject: [Cluster-devel] conga/luci/site/luci/Extensions ricci_bridge.py
Message-ID: <20070321171807.28721.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-03-21 17:18:06

Modified files:
	luci/site/luci/Extensions: ricci_bridge.py 

Log message:
	Set the default post join delay for non-rhel4 clusters to 12s.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ricci_bridge.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.30.2.19&r2=1.30.2.20

--- conga/luci/site/luci/Extensions/ricci_bridge.py	2007/03/12 04:22:26	1.30.2.19
+++ conga/luci/site/luci/Extensions/ricci_bridge.py	2007/03/21 17:18:06	1.30.2.20
@@ -119,7 +119,12 @@
 	batch += '<var mutable="false" name="propagate" type="boolean" value="false"/>'
 	batch += '<var mutable="false" name="cluster.conf" type="xml">'
 	batch += '<cluster config_version="1" name="' + cluster_name + '">'
-	batch += '<fence_daemon post_fail_delay="0" post_join_delay="3"/>'
+
+	if os_str == 'rhel4':
+		batch += '<fence_daemon post_fail_delay="0" post_join_delay="3"/>'
+	else:
+		batch += '<fence_daemon post_fail_delay="0" post_join_delay="12"/>'
+
 	batch += '<clusternodes/>'
 	batch += '<cman/>'
 	batch += '<fencedevices/>'
@@ -232,7 +237,12 @@
 	batch += '<var mutable="false" name="propagate" type="boolean" value="false"/>'
 	batch += '<var mutable="false" name="cluster.conf" type="xml">'
 	batch += '<cluster config_version="1" name="' + cluster_name + '" alias="' + cluster_alias + '">'
-	batch += '<fence_daemon post_fail_delay="0" post_join_delay="3"/>'
+
+	if os_str == 'rhel4':
+		batch += '<fence_daemon post_fail_delay="0" post_join_delay="3"/>'
+	else:
+		batch += '<fence_daemon post_fail_delay="0" post_join_delay="12"/>'
+
 	batch += '<clusternodes>'
 	x = 1
 	for i in nodeList: