From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 13 Feb 2007 19:50:39 -0000
Subject: [Cluster-devel] conga/luci/site/luci/Extensions cluster_adapte ...
Message-ID: <20070213195039.24328.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
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2007-02-13 19:50:39

Modified files:
	luci/site/luci/Extensions: cluster_adapters.py 

Log message:
	Fix for service info display when a gulm cluster is unresponsive.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.227.2.6&r2=1.227.2.7

--- conga/luci/site/luci/Extensions/cluster_adapters.py	2007/02/12 20:25:42	1.227.2.6
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2007/02/13 19:50:39	1.227.2.7
@@ -4569,7 +4569,9 @@
   infohash['currentservices'] = svc_dict_list
 
   fdom_dict_list = list()
+  gulm_cluster = False
   if model:
+    gulm_cluster = model.getGULMPtr() is not None
     try:
       infohash['gulm_lockserver'] = model.isNodeLockserver(nodename)
     except:
@@ -4607,7 +4609,7 @@
     if rc is not None:
       dlist = list()
       dlist.append("ccsd")
-      if model.getGULMPtr() is None:
+      if not gulm_cluster:
         dlist.append("cman")
         dlist.append("fenced")
       else: