From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 22 Aug 2007 20:37:38 -0000
Subject: [Cluster-devel] conga/luci/site/luci/Extensions RicciQueries.py
Message-ID: <20070822203738.27227.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: 	RHEL4
Changes by:	rmccabe at sourceware.org	2007-08-22 20:37:38

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

Log message:
	set the nodeid attribute for clusternode tags for rhel4 dlm clusters

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/RicciQueries.py.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.7.2.1&r2=1.7.2.2

--- conga/luci/site/luci/Extensions/RicciQueries.py	2007/08/09 21:35:20	1.7.2.1
+++ conga/luci/site/luci/Extensions/RicciQueries.py	2007/08/22 20:37:38	1.7.2.2
@@ -204,9 +204,10 @@
 	batch.append('<cluster config_version="1" name="%s" alias="%s">' % (cluster_name, cluster_alias))
 	batch.append('<fence_daemon post_fail_delay="0" post_join_delay="3"/>')
 	batch.append('<clusternodes>')
+
 	x = 1
 	for i in nodeList:
-		if os_str == 'rhel4':
+		if gulm_lockservers:
 			batch.append('<clusternode name="%s" votes="1"/>' % i)
 		else:
 			batch.append('<clusternode name="%s" votes="1" nodeid="%d"/>' % (i, x))