[Cluster-devel] conga ./clustermon.spec.in.in ./conga.spec.in. ...

[rmccabe@sourceware.org <rmccabe@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2008-04-18 03:31:46

Modified files:
	.              : clustermon.spec.in.in conga.spec.in.in 
	luci/cluster   : fence-macros validate_fence.js 
	luci/site/luci/Extensions: FenceHandler.py 

Log message:
	Fix bz442933 (Luci inserts "hostname" instead of "ipaddr" for rsa II fencing device)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.25.2.13&r2=1.25.2.14
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67.2.24&r2=1.67.2.25
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/fence-macros.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.2.4.3&r2=1.2.4.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_fence.js.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.3.2.5&r2=1.3.2.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/FenceHandler.py.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.17.2.7&r2=1.17.2.8

--- conga/clustermon.spec.in.in	2008/04/14 17:17:29	1.25.2.13
+++ conga/clustermon.spec.in.in	2008/04/18 03:31:46	1.25.2.14
@@ -194,6 +194,9 @@
 
 
 %changelog
+* Tue Apr 15 2008 Ryan McCabe <rmccabe@redhat.com> 0.11.1-3
+- Fix bz441966 (cluster-snmp dlopen failure)
+ 
 * Tue Mar 25 2008 Ryan McCabe <rmccabe@redhat.com> 0.11.1-2
 - Fix bz441376 (modclusterd segfaults during startup)
 - Backport fixes from RHEL5
--- conga/conga.spec.in.in	2008/04/14 15:55:08	1.67.2.24
+++ conga/conga.spec.in.in	2008/04/18 03:31:46	1.67.2.25
@@ -301,6 +301,7 @@
 
 %changelog
 * Tue Mar 25 2008 Ryan McCabe <rmccabe@redhat.com> 0.11.1-2
+- Fix bz442933 (Luci inserts "hostname" instead of "ipaddr" for rsa II fencing device)
 - Fix bz442369 (conga should install 'sg3_utils' and start service 'scsi_reserve' when scsi fencing is used)
 - Fix bz441574 (nodename" field for fence_scsi disabled when adding a new fence device/instance)
 - Fix bz349561 (Add Conga support for Oracle Resource Agent)
--- conga/luci/cluster/fence-macros	2008/04/11 22:43:17	1.2.4.3
+++ conga/luci/cluster/fence-macros	2008/04/18 03:31:46	1.2.4.4
@@ -188,6 +188,10 @@
 		<tal:block metal:use-macro="here/fence-macros/macros/fence-form-rsa" />
 	</tal:block>
 
+	<tal:block tal:condition="python: cur_fence_type == 'fence_rsb'">
+		<tal:block metal:use-macro="here/fence-macros/macros/fence-form-rsb" />
+	</tal:block>
+
 	<tal:block tal:condition="python: cur_fence_type == 'fence_brocade'">
 		<tal:block metal:use-macro="here/fence-macros/macros/fence-form-brocade" />
 	</tal:block>
@@ -329,6 +333,7 @@
 	<option name="fence_egenera" value="fence_egenera">Egenera SAN Controller</option>
 	<option name="fence_ilo" value="fence_ilo">HP iLO</option>
 	<option name="fence_rsa" value="fence_rsa">IBM RSA II</option>
+	<option name="fence_rsb" value="fence_rsb">Fujitsu Siemens RSB</option>
 	<option name="fence_bladecenter" value="fence_bladecenter">IBM Blade Center</option>
 	<option name="fence_bullpap" value="fence_bullpap">Bull PAP</option>
 	<option name="fence_rps10" value="fence_rps10">RPS10 Serial Switch</option>
@@ -701,8 +706,8 @@
 			<tr>
 				<td>Hostname</td>
 				<td>
-					<input name="hostname" type="text"
-						tal:attributes="value cur_fencedev/hostname | nothing" />
+					<input name="ipaddr" type="text"
+						tal:attributes="value cur_fencedev/ipaddr | nothing" />
 				</td>
 			</tr>
 			<tr>
@@ -742,6 +747,66 @@
 	</div>
 </div>
 
+<div metal:define-macro="fence-form-rsb"
+	tal:attributes="id cur_fencedev/name | nothing">
+
+	<div id="fence_rsb" class="fencedev">
+		<table>
+			<tr>
+				<td><strong class="cluster">Fence Type</strong></td>
+				<td>Fujitsu Siemens RemoteView Service Board (RSB)</td>
+			</tr>
+			<tr>
+				<td>Name</td>
+				<td>
+					<input name="name" type="text"
+						tal:attributes="value cur_fencedev/name | nothing" />
+				</td>
+			</tr>
+			<tr>
+				<td>Hostname</td>
+				<td>
+					<input name="ipaddr" type="text"
+						tal:attributes="value cur_fencedev/ipaddr | nothing" />
+				</td>
+			</tr>
+			<tr>
+				<td>Login</td>
+				<td>
+					<input name="login" type="text"
+						tal:attributes="value cur_fencedev/login | nothing" />
+				</td>
+			</tr>
+			<tr>
+				<td>Password</td>
+				<td>
+					<input name="passwd" type="password" autocomplete="off"
+						tal:attributes="value nothing" />
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<span title="Full path to a script to generate fence password">Password Script (optional)</span>
+				</td>
+				<td>
+					<input type="text" name="passwd_script"
+						tal:attributes="
+							disabled cur_fencedev/isShared | nothing;
+							value cur_fencedev/passwd_script | nothing" />
+				</td>
+			</tr>
+		</table>
+
+		<tal:block tal:condition="exists: cur_fencedev">
+			<input type="hidden" name="existing_device" value="1" />
+			<input type="hidden" name="orig_name"
+				tal:attributes="value cur_fencedev/name | nothing" />
+		</tal:block>
+
+		<input type="hidden" name="fence_type" value="fence_rsb" />
+	</div>
+</div>
+
 <div metal:define-macro="fence-form-brocade"
 	tal:attributes="id cur_fencedev/name | nothing">
 
@@ -1376,6 +1441,7 @@
 	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-ilo" />
 	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-drac" />
 	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-rsa" />
+	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-rsb" />
 	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-brocade" />
 	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-sanbox2" />
 	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-vixel" />
--- conga/luci/cluster/validate_fence.js	2008/03/25 01:27:10	1.3.2.5
+++ conga/luci/cluster/validate_fence.js	2008/04/18 03:31:46	1.3.2.6
@@ -34,7 +34,8 @@
 fence_validator['manual'] = [];
 fence_validator['mcdata'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script' ];
 fence_validator['rps10'] = [ 'device', 'port'];
-fence_validator['rsa'] = [ 'hostname', 'login', 'passwd', 'passwd_script' ];
+fence_validator['rsa'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script' ];
+fence_validator['rsb'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script' ];
 fence_validator['sanbox2'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script' ];
 fence_validator['scsi'] = [];
 fence_validator['unknown'] = [];
--- conga/luci/site/luci/Extensions/FenceHandler.py	2008/03/25 01:27:11	1.17.2.7
+++ conga/luci/site/luci/Extensions/FenceHandler.py	2008/04/18 03:31:46	1.17.2.8
@@ -543,10 +543,10 @@
 	errors = list()
 
 	try:
-		hostname = form['hostname'].strip()
+		hostname = form['ipaddr'].strip()
 		if not hostname:
 			raise Exception, 'blank'
-		fencedev.addAttribute('hostname', hostname)
+		fencedev.addAttribute('ipaddr', hostname)
 	except Exception, e:
 		errors.append(FD_PROVIDE_HOSTNAME)
 
@@ -822,6 +822,7 @@
 	'fence_ipmilan':		val_ipmilan_fd,
 	'fence_drac':			val_drac_fd,
 	'fence_rsa':			val_rsa_fd,
+	'fence_rsb':			val_rsa_fd, # same params as rsa
 	'fence_rps10':			val_rps10_fd,
 	'fence_manual':			val_noop_fd
 }
@@ -1082,6 +1083,7 @@
 	'fence_ipmilan':		val_noop_fi,
 	'fence_drac':			val_noop_fi,
 	'fence_rsa':			val_noop_fi,
+	'fence_rsb':			val_noop_fi,
 	'fence_rps10':			val_noop_fi
 }