[Cluster-devel] conga/luci/cluster form-macros

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-01-09 22:20:34

Modified files:
	luci/cluster   : form-macros 

Log message:
	add lanplus attribute for ipmi fencing and add nodename attribute for scsi

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.146&r2=1.147

--- conga/luci/cluster/form-macros	2007/01/09 18:27:04	1.146
+++ conga/luci/cluster/form-macros	2007/01/09 22:20:34	1.147
@@ -2042,6 +2042,14 @@
 				<td>Authentication Type</td>
 				<td><input name="auth_type" type="text" Title="Options are to leave blank for none, password, md2, or md5"/></td>
 			</tr>
+			<tr>
+				<td>Use Lanplus</td>
+				<td>
+					<input name="lanplus" type="checkbox"
+						tal:attributes="checked cur_fencedev/lanplus | nothing"
+					/>
+				</td>
+			</tr>
 		</table>
 
 		<tal:block tal:condition="exists: cur_fencedev">
@@ -2192,6 +2200,7 @@
 			</td></tr>
 		</table>
 
+		<input name="fence_instance" value="1" />
 		<input tal:condition="exists: cur_instance"
 			type="hidden" name="existing_instance" value="1" />
 		<input type="hidden" name="parent_fencedev"
@@ -2233,6 +2242,7 @@
 			</td></tr>
 		</table>
 
+		<input name="fence_instance" value="1" />
 		<input tal:condition="exists: cur_instance"
 			type="hidden" name="existing_instance" value="1" />
 		<input type="hidden" name="parent_fencedev"
@@ -2267,6 +2277,7 @@
 			</td></tr>
 		</table>
 
+		<input name="fence_instance" value="1" />
 		<input tal:condition="exists: cur_instance"
 			type="hidden" name="existing_instance" value="1" />
 		<input type="hidden" name="parent_fencedev"
@@ -2301,6 +2312,7 @@
 			</td></tr>
 		</table>
 
+		<input name="fence_instance" value="1" />
 		<input tal:condition="exists: cur_instance"
 			type="hidden" name="existing_instance" value="1" />
 		<input type="hidden" name="parent_fencedev"
@@ -2335,6 +2347,7 @@
 			</td></tr>
 		</table>
 
+		<input name="fence_instance" value="1" />
 		<input tal:condition="exists: cur_instance"
 			type="hidden" name="existing_instance" value="1" />
 		<input type="hidden" name="parent_fencedev"
@@ -2369,6 +2382,7 @@
 			</td></tr>
 		</table>
 
+		<input name="fence_instance" value="1" />
 		<input tal:condition="exists: cur_instance"
 			type="hidden" name="existing_instance" value="1" />
 		<input type="hidden" name="parent_fencedev"
@@ -2403,6 +2417,7 @@
 			</td></tr>
 		</table>
 
+		<input name="fence_instance" value="1" />
 		<input tal:condition="exists: cur_instance"
 			type="hidden" name="existing_instance" value="1" />
 		<input type="hidden" name="parent_fencedev"
@@ -2437,6 +2452,7 @@
 			</td></tr>
 		</table>
 
+		<input name="fence_instance" value="1" />
 		<input tal:condition="exists: cur_instance"
 			type="hidden" name="existing_instance" value="1" />
 		<input type="hidden" name="parent_fencedev"
@@ -2471,6 +2487,7 @@
 			</td></tr>
 		</table>
 
+		<input name="fence_instance" value="1" />
 		<input tal:condition="exists: cur_instance"
 			type="hidden" name="existing_instance" value="1" />
 		<input type="hidden" name="parent_fencedev"
@@ -2505,6 +2522,29 @@
 			</td></tr>
 		</table>
 
+		<input name="fence_instance" value="1" />
+		<input tal:condition="exists: cur_instance"
+			type="hidden" name="existing_instance" value="1" />
+		<input type="hidden" name="parent_fencedev"
+			tal:attributes="value cur_fence_dev_id | nothing" />
+	</div>
+</div>
+
+<div metal:define-macro="fence-instance-form-scsi"
+	tal:omit-tag="exists: cur_fence_dev_id">
+	<div id="fence_scsi_instance" name="fence_scsi" class="fencedev_instance"
+		tal:omit-tag="exists: cur_fence_dev_id">
+		<table>
+			<tr>
+				<td>Node name</td>
+				<td>
+					<input type="text" name="nodename" disabled="disabled"
+						tal:attributes="value request/nodename | nothing" />
+				</td>
+			</tr>
+		</table>
+
+		<input name="fence_instance" value="1" />
 		<input tal:condition="exists: cur_instance"
 			type="hidden" name="existing_instance" value="1" />
 		<input type="hidden" name="parent_fencedev"
@@ -2539,6 +2579,7 @@
 			</td></tr>
 		</table>
 
+		<input name="fence_instance" value="1" />
 		<input tal:condition="exists: cur_instance"
 			type="hidden" name="existing_instance" value="1" />
 		<input type="hidden" name="parent_fencedev"
@@ -2566,6 +2607,8 @@
 	<tal:block
 		metal:use-macro="here/form-macros/macros/fence-instance-form-bullpap" />
 	<tal:block
+		metal:use-macro="here/form-macros/macros/fence-instance-form-scsi" />
+	<tal:block
 		metal:use-macro="here/form-macros/macros/fence-instance-form-xvm" />
 	<tal:block
 		metal:use-macro="here/form-macros/macros/fence-instance-form-bladecenter" />
@@ -2619,6 +2662,11 @@
 			metal:use-macro="here/form-macros/macros/fence-instance-form-bullpap" />
 	</tal:block>
 
+    <tal:block tal:condition="python: cur_fence_type == 'fence_scsi'">
+		<tal:block
+			metal:use-macro="here/form-macros/macros/fence-instance-form-scsi" />
+	</tal:block>
+
     <tal:block tal:condition="python: cur_fence_type == 'fence_xvm'">
 		<tal:block
 			metal:use-macro="here/form-macros/macros/fence-instance-form-xvm" />
@@ -2993,6 +3041,10 @@
 			<td>
 				<div class="fence_control">
 					<form name="fence1_master" method="post" action="">
+						<input type="hidden" name="clustername"
+							tal:attributes="value request/clustername | nothing" />
+						<input type="hidden" name="nodename"
+							tal:attributes="value request/nodename | nothing" />
 						<input type="hidden" name="fence_level" value="1" />
 						<input type="hidden" name="fence_xml" value="" />
 						<input type="hidden" name="pagetype" value="58" />
@@ -3005,6 +3057,10 @@
 			<td>
 				<div class="fence_control">
 					<form name="fence2_master" method="post" action="">
+						<input type="hidden" name="clustername"
+							tal:attributes="value request/clustername | nothing" />
+						<input type="hidden" name="nodename"
+							tal:attributes="value request/nodename | nothing" />
 						<input type="hidden" name="fence_level" value="2" />
 						<input type="hidden" name="fence_xml" value="" />
 						<input type="hidden" name="pagetype" value="58" />