From mboxrd@z Thu Jan  1 00:00:00 1970
From: jparsons@sourceware.org <jparsons@sourceware.org>
Date: 20 Nov 2006 20:13:42 -0000
Subject: [Cluster-devel] conga/luci/cluster form-macros
Message-ID: <20061120201342.26722.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	jparsons at sourceware.org	2006-11-20 20:13:42

Modified files:
	luci/cluster   : form-macros 

Log message:
	minor addition to formlist to support shared devices only

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

--- conga/luci/cluster/form-macros	2006/11/13 21:40:55	1.105
+++ conga/luci/cluster/form-macros	2006/11/20 20:13:42	1.106
@@ -1711,9 +1711,26 @@
 	<tal:block metal:use-macro="here/form-macros/macros/fence-form-bullpap" />
 	<tal:block metal:use-macro="here/form-macros/macros/fence-form-rps10" />
 	<tal:block metal:use-macro="here/form-macros/macros/fence-form-ipmilan" />
+	<tal:block metal:use-macro="here/form-macros/macros/fence-form-xvm" />
+	<tal:block metal:use-macro="here/form-macros/macros/fence-form-scsi" />
 	<tal:block metal:use-macro="here/form-macros/macros/fence-form-manual" />
 </div>
 
+<div metal:define-macro="shared-fence-form-list">
+	<tal:block metal:use-macro="here/form-macros/macros/fence-form-apc" />
+	<tal:block metal:use-macro="here/form-macros/macros/fence-form-mcdata" />
+	<tal:block metal:use-macro="here/form-macros/macros/fence-form-wti" />
+	<tal:block metal:use-macro="here/form-macros/macros/fence-form-brocade" />
+	<tal:block metal:use-macro="here/form-macros/macros/fence-form-sanbox2" />
+	<tal:block metal:use-macro="here/form-macros/macros/fence-form-vixel" />
+	<tal:block metal:use-macro="here/form-macros/macros/fence-form-gnbd" />
+	<tal:block metal:use-macro="here/form-macros/macros/fence-form-egenera" />
+	<tal:block metal:use-macro="here/form-macros/macros/fence-form-bladecenter" />
+	<tal:block metal:use-macro="here/form-macros/macros/fence-form-bullpap" />
+	<tal:block metal:use-macro="here/form-macros/macros/fence-form-xvm" />
+	<tal:block metal:use-macro="here/form-macros/macros/fence-form-scsi" />
+</div>
+
 <div metal:define-macro="node-form">
 	<script type="text/javascript">
 		set_page_title('Luci ??? cluster ??? nodes ??? properties');
@@ -2622,6 +2639,7 @@
 		set_page_title('Luci ??? cluster ??? failover domains ??? Add a failover domain');
 	</script>
 	<h2>Failover Domain Add Form</h2>
+  <tal:block tal:define="allnodes python:here.getFdomNodes(request)"/>
 </div>
 
 <div metal:define-macro="fdomconfig-form">
@@ -2678,7 +2696,7 @@
 		set_page_title('Luci ??? cluster ??? fence devices - Add a new fence device');
 	</script>
 
-	<h2>Add a Fence Device</h2>
+	<h2>Add a Sharable Fence Device</h2>
 
 	<div id="invisible" class="invisible">
 		<tal:block metal:use-macro="here/form-macros/macros/fence-form-list" />
@@ -2823,6 +2841,14 @@
 		<tal:block metal:use-macro="here/form-macros/macros/fence-form-ipmilan" />
 	</tal:block>
 
+	<tal:block tal:condition="python: cur_fence_type == 'fence_xvm'">
+		<tal:block metal:use-macro="here/form-macros/macros/fence-form-xvm" />
+	</tal:block>
+
+	<tal:block tal:condition="python: cur_fence_type == 'fence_scsi'">
+		<tal:block metal:use-macro="here/form-macros/macros/fence-form-scsi" />
+	</tal:block>
+
 	<tal:block tal:condition="python: cur_fence_type == 'fence_manual'">
 		<tal:block metal:use-macro="here/form-macros/macros/fence-form-manual" />
 	</tal:block>