Attachment 592219 Details for Bug 832185 – fix

[patch] fix

bz832185.patch (text/plain), 2.25 KB, created by Ryan McCabe on 2012-06-15 20:10:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ryan McCabe

Created: 2012-06-15 20:10:56 UTC

Size: 2.25 KB

patch

obsolete

>commit 6b9f2f29652e3c201db62702af0649ae0d99173e
>Author: root <root@testcluster-node1.(none)>
>Date:   Fri Jun 15 13:38:12 2012 -0400
>
>    ilo mp ident file
>
>diff --git a/luci/cluster/fence-macros b/luci/cluster/fence-macros
>index af8aec7..73830df 100644
>--- a/luci/cluster/fence-macros
>+++ b/luci/cluster/fence-macros
>@@ -791,6 +791,14 @@
> 						type="checkbox" name="secure" />
> 				</td>
> 			</tr>
>+			<tr tal:condition="exists:clusterinfo/has_fence_ssh">
>+				<td>Path to SSH identity file</td>
>+				<td>
>+					<input type="text" name="identity_file"
>+						tal:attributes="
>+							value cur_fencedev/identity_file | nothing" />
>+				</td>
>+			</tr>
> 			<tr>
> 				<td>Force command prompt</td>
> 				<td>
>diff --git a/luci/cluster/validate_fence.js b/luci/cluster/validate_fence.js
>index f7a24b8..6040d82 100644
>--- a/luci/cluster/validate_fence.js
>+++ b/luci/cluster/validate_fence.js
>@@ -37,7 +37,7 @@ fence_validator['drac'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script', 'secur
> fence_validator['egenera'] = [ 'cserver' ];
> fence_validator['gnbd'] = [ 'servers' ];
> fence_validator['ilo'] = [ 'hostname', 'login', 'passwd', 'passwd_script', 'ssl' ];
>-fence_validator['ilo_mp'] = [ 'hostname', 'login', 'passwd', 'passwd_script', 'secure', 'ipport', 'secure', 'cmd_prompt' ];
>+fence_validator['ilo_mp'] = [ 'hostname', 'login', 'passwd', 'passwd_script', 'secure', 'ipport', 'secure', 'cmd_prompt', 'identity_file' ];
> fence_validator['ipmilan'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script', 'lanplus', 'auth' ];
> fence_validator['manual'] = [];
> fence_validator['mcdata'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script' ];
>diff --git a/luci/site/luci/Extensions/FenceHandler.py b/luci/site/luci/Extensions/FenceHandler.py
>index c7c418c..fa81de3 100755
>--- a/luci/site/luci/Extensions/FenceHandler.py
>+++ b/luci/site/luci/Extensions/FenceHandler.py
>@@ -1646,6 +1646,17 @@ def val_ilo_mp_fd(form, fencedev):
> 		fencedev.removeAttribute('secure')
> 
> 	try:
>+		identity_file = form['identity_file'].strip()
>+		if not identity_file:
>+			raise Exception, 'blank'
>+		fencedev.addAttribute('identity_file', identity_file)
>+	except Exception, e:
>+		try:
>+			fencedev.removeAttribute('identity_file')
>+		except:
>+			pass
>+
>+	try:
> 		ipport = form['ipport'].strip()
> 		if ipport:
> 			ipport = int(ipport)

Actions: View | Diff

Attachments on bug 832185: 592219