Attachment 592221 Details for Bug 832183 – fix

[patch] fix

bz832183.patch (text/plain), 3.04 KB, created by Ryan McCabe on 2012-06-15 20:18:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ryan McCabe

Created: 2012-06-15 20:18:37 UTC

Size: 3.04 KB

patch

obsolete

>commit c3746133db3333ca080c1ef558129e17d4de727d
>Author: root <root@testcluster-node1.(none)>
>Date:   Fri Jun 15 13:20:03 2012 -0400
>
>    Add SSL for ilo
>
>diff --git a/luci/cluster/fence-macros b/luci/cluster/fence-macros
>index 2d32c78..af8aec7 100644
>--- a/luci/cluster/fence-macros
>+++ b/luci/cluster/fence-macros
>@@ -693,6 +693,17 @@
> 				</td>
> 			</tr>
> 			<tr>
>+				<td>Use SSL connections</td>
>+				<td>
>+					<input tal:condition="exists:cur_fencedev"
>+						type="checkbox" name="ssl"
>+						tal:attributes="
>+							checked python:(cur_fencedev and cur_fencedev.has_key('ssl') and (cur_fencedev['ssl'] == '1' or cur_fencedev['ssl'].lower() == 'true')) and 'checked' or ''" />
>+					<input tal:condition="not:exists:cur_fencedev"
>+						type="checkbox" name="ssl" />
>+				</td>
>+			</tr>
>+			<tr>
> 				<td>Power wait (seconds)</td>
> 				<td>
> 					<input type="text" name="power_wait"
>diff --git a/luci/cluster/validate_fence.js b/luci/cluster/validate_fence.js
>index 48e9a7c..f7a24b8 100644
>--- a/luci/cluster/validate_fence.js
>+++ b/luci/cluster/validate_fence.js
>@@ -36,7 +36,7 @@ fence_validator['bullpap'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script' ];
> fence_validator['drac'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script', 'secure' ];
> fence_validator['egenera'] = [ 'cserver' ];
> fence_validator['gnbd'] = [ 'servers' ];
>-fence_validator['ilo'] = [ 'hostname', 'login', 'passwd', 'passwd_script', 'secure' ];
>+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['ipmilan'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script', 'lanplus', 'auth' ];
> fence_validator['manual'] = [];
>diff --git a/luci/site/luci/Extensions/FenceHandler.py b/luci/site/luci/Extensions/FenceHandler.py
>index 1fed54d..c7c418c 100755
>--- a/luci/site/luci/Extensions/FenceHandler.py
>+++ b/luci/site/luci/Extensions/FenceHandler.py
>@@ -1516,6 +1516,12 @@ def val_ilo_fd(form, fencedev):
> 	except Exception, e:
> 		errors.append(FD_PROVIDE_LOGIN)
> 
>+	use_ssl = form.has_key('ssl') and form['ssl'].lower() in ('1', 'on', 'true')
>+	if use_ssl:
>+		fencedev.addAttribute('ssl', '1')
>+	else:
>+		fencedev.removeAttribute('ssl')
>+
> 	try:
> 		power_wait = form['power_wait'].strip()
> 		if power_wait:
>
>commit ca21587e148a5c2c75e36c20d5b4b886f4dfabd7
>Author: root <root@testcluster-node1.(none)>
>Date:   Fri Jun 15 13:39:30 2012 -0400
>
>    Ilo fix2
>
>diff --git a/luci/cluster/fence-macros b/luci/cluster/fence-macros
>index 73830df..de78a18 100644
>--- a/luci/cluster/fence-macros
>+++ b/luci/cluster/fence-macros
>@@ -688,7 +688,6 @@
> 				<td>
> 					<input type="text" name="passwd_script"
> 						tal:attributes="
>-							disabled cur_fencedev/isShared | nothing;
> 							value cur_fencedev/passwd_script | nothing" />
> 				</td>
> 			</tr>
>@@ -708,7 +707,6 @@
> 				<td>
> 					<input type="text" name="power_wait"
> 						tal:attributes="
>-							disabled cur_fencedev/isShared | nothing;
> 							value cur_fencedev/power_wait | nothing" />
> 				</td>
> 			</tr>

Actions: View | Diff

Attachments on bug 832183: 592221