[Cluster-devel] conga/luci/site/luci/Extensions ricci_bridge.py

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2007-03-21 17:16:51

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=RHEL4&r1=1.56.2.5&r2=1.56.2.6

--- conga/luci/site/luci/Extensions/ricci_bridge.py	2007/03/12 04:24:34	1.56.2.5
+++ conga/luci/site/luci/Extensions/ricci_bridge.py	2007/03/21 17:16:51	1.56.2.6
@@ -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: