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

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-08-09 20:26:12

Modified files:
	luci/cluster   : form-macros 

Log message:
	Do not report cman is not running if 'service cman status' returns non-zero on account of fence_xvmd not running

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.90.2.29&r2=1.90.2.30

--- conga/luci/cluster/form-macros	2007/08/09 04:34:49	1.90.2.29
+++ conga/luci/cluster/form-macros	2007/08/09 20:26:11	1.90.2.30
@@ -3291,21 +3291,28 @@
 			</td></tr>
 		</tfoot>
 		<tbody class="systemsTable">
-			<tr class="systemsTable" tal:repeat="demon nodeinfo/d_states">
-				<td class="systemsTable"><span tal:replace="demon/name"/></td>
-				<td class="systemsTable"><span tal:replace="python: demon['running'] == 'true' and 'yes' or 'no'" /></td>
+			<tr class="systemsTable" tal:repeat="daemon nodeinfo/d_states">
+				<td class="systemsTable"><span tal:replace="daemon/name"/></td>
+				<td class="systemsTable">
+					<tal:block tal:condition="python:daemon['name'] == 'cman'">
+						<span tal:replace="python: (daemon['running'] == 'true' or nodeinfo['nodestate'] == '0') and 'yes' or 'no'" />
+					</tal:block>
+					<tal:block tal:condition="python:daemon['name'] != 'cman'">
+						<span tal:replace="python: daemon['running'] == 'true' and 'yes' or 'no'" />
+					</tal:block>
+				</td>
 				<td class="systemsTable">
 					<input type="hidden" tal:attributes="
-						name python: '__daemon__:' + demon['name'] + ':';
-						value demon/name" />
+						name python: '__daemon__:' + daemon['name'] + ':';
+						value daemon/name" />
 
 					<input type="hidden" tal:attributes="
-						name python: '__daemon__:' + demon['name'] + ':';
-						value python: demon['enabled'] == 'true' and '1' or '0'" />
+						name python: '__daemon__:' + daemon['name'] + ':';
+						value python: daemon['enabled'] == 'true' and '1' or '0'" />
 
 					<input type="checkbox" tal:attributes="
-						name python: '__daemon__:' + demon['name'] + ':';
-						checked python: demon['enabled'] == 'true' and 'checked'" />
+						name python: '__daemon__:' + daemon['name'] + ':';
+						checked python: daemon['enabled'] == 'true' and 'checked'" />
 				</td>
 			</tr>
 		</tbody>