From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 21 Sep 2007 03:11:54 -0000
Subject: [Cluster-devel] conga/luci cluster/form-macros site/luci/Exten ...
Message-ID: <20070921031154.28900.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
Changes by:	rmccabe at sourceware.org	2007-09-21 03:11:53

Modified files:
	luci/cluster   : form-macros 
	luci/site/luci/Extensions: FenceHandler.py 

Log message:
	In RHEL5.2 and 4.7 on fence_scsi will accept "nodename," too, but use "node"
	for backward compatibility with older cluster nodes.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.211&r2=1.212
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/FenceHandler.py.diff?cvsroot=cluster&r1=1.24&r2=1.25

--- conga/luci/cluster/form-macros	2007/09/11 16:04:32	1.211
+++ conga/luci/cluster/form-macros	2007/09/21 03:11:53	1.212
@@ -3017,8 +3017,8 @@
 			<tr>
 				<td>Node name</td>
 				<td>
-					<input type="text" name="nodename" disabled="disabled"
-						tal:attributes="value request/nodename | nothing" />
+					<input type="text" name="node" disabled="disabled"
+						tal:attributes="value request/node | nothing" />
 				</td>
 			</tr>
 		</table>
--- conga/luci/site/luci/Extensions/FenceHandler.py	2007/09/21 03:02:46	1.24
+++ conga/luci/site/luci/Extensions/FenceHandler.py	2007/09/21 03:11:53	1.25
@@ -996,10 +996,10 @@
 	errors = list()
 
 	try:
-		nodename = form['nodename'].strip()
+		nodename = form['node'].strip()
 		if not nodename:
 			raise Exception, 'blank'
-		fenceinst.addAttribute('nodename', nodename)
+		fenceinst.addAttribute('node', nodename)
 	except Exception, e:
 		errors.append(FI_PROVIDE_NODENAME)