[Cluster-devel] conga/luci cluster/fence-macros cluster/valida ...

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

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2009-04-23 20:38:52

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

Log message:
	fix bz492392

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/fence-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.2.2.10&r2=1.2.2.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_fence.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.2.10&r2=1.1.2.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/FenceHandler.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.4.2.16&r2=1.4.2.17

--- conga/luci/cluster/fence-macros	2009/02/18 19:13:30	1.2.2.10
+++ conga/luci/cluster/fence-macros	2009/04/23 20:38:51	1.2.2.11
@@ -633,19 +633,6 @@
 							value cur_fencedev/passwd_script | nothing" />
 				</td>
 			</tr>
-			<tr tal:condition="exists:clusterinfo/has_fence_ssh">
-				<td>
-					<span title="Enable SSH operation">Use SSH</span>
-				</td>
-				<td>
-					<input tal:condition="exists:cur_fencedev"
-						type="checkbox" name="secure"
-						tal:attributes="
-							checked python:(cur_fencedev and cur_fencedev.has_key('secure') and (cur_fencedev['secure'] == '1' or cur_fencedev['secure'].lower() == 'true')) and 'checked' or ''" />
-					<input tal:condition="not:exists:cur_fencedev"
-						type="checkbox" name="secure" />
-				</td>
-			</tr>
 		</table>
 
 		<tal:block tal:condition="exists: cur_fencedev">
--- conga/luci/cluster/validate_fence.js	2009/02/18 19:13:30	1.1.2.10
+++ conga/luci/cluster/validate_fence.js	2009/04/23 20:38:51	1.1.2.11
@@ -78,7 +78,6 @@
 			set_form_err(form_elem);
 			errors.push(form_elem.name + ' values must not be empty.');
 		}
-		return (errors);
 	}
 
 	if (errors && errors.length > 0 &&
@@ -87,7 +86,7 @@
 		clr_form_err(form_elem);
 		return (null);
 	}
-	return errors;
+	return (errors);
 }
 
 /* Very loose checking for now -- just make sure it's not blank */
--- conga/luci/site/luci/Extensions/FenceHandler.py	2009/02/18 19:13:30	1.4.2.16
+++ conga/luci/site/luci/Extensions/FenceHandler.py	2009/04/23 20:38:52	1.4.2.17
@@ -967,12 +967,6 @@
 	if not has_passwd:
 		errors.append(FD_PROVIDE_PASSWD)
 
-	use_ssh = form.has_key('secure') and (form['secure'] == '1' or form['secure'].lower() == 'true')
-	if use_ssh:
-		fencedev.addAttribute('secure', '1')
-	else:
-		fencedev.removeAttribute('secure')
-
 	return errors
 
 FD_VALIDATE = {