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

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

[rmccabe]

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))

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-07-27 21:17:41

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

Log message:
	Ignore text nodes when looking for cluster.conf

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

--- conga/luci/site/luci/Extensions/RicciQueries.py	2007/07/26 04:20:59	1.1.4.4
+++ conga/luci/site/luci/Extensions/RicciQueries.py	2007/07/27 21:17:41	1.1.4.5
@@ -671,6 +671,8 @@
 	return resultlist
 
 def getClusterConf(rc):
+	import xml.dom
+
 	if rc is None:
 		return None
 
@@ -712,7 +714,9 @@
 	var_nodes = ret.getElementsByTagName('var')
 	for i in var_nodes:
 		if i.getAttribute('name') == 'cluster.conf':
-			return i.childNodes[0]
+			for j in i.childNodes:
+				if j.nodeType == xml.dom.Node.ELEMENT_NODE:
+					return j
 
 	if LUCI_DEBUG_MODE is True:
 		luci_log.debug_verbose('GCC2: no conf node found')