From mboxrd@z Thu Jan  1 00:00:00 1970
From: jparsons@sourceware.org <jparsons@sourceware.org>
Date: 11 Oct 2006 23:11:13 -0000
Subject: [Cluster-devel] conga/luci/site/luci/Extensions cluster_adapte ...
Message-ID: <20061011231113.15210.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-10-11 23:11:13

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

Log message:
	resolver issue conflicts

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

--- conga/luci/site/luci/Extensions/cluster_adapters.py	2006/10/11 23:08:34	1.96
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2006/10/11 23:11:12	1.97
@@ -2347,20 +2347,12 @@
     map['isVirtualized'] = False
     return map
 
-  try:
-	  ricci_agent = resolve_nodename(self, clustername, ragent)
-  except:
-    map = {}
-    map['os'] = ""
-    map['isVirtualized'] = False
-    return map
-
-	rc = RicciCommunicator(ricci_agent)
-	map = {}
-	os_str = resolveOSType(rc.os())
-	map['os'] = os_str
-	map['isVirtualized'] = rc.dom0()
-	return map
+  rc = RicciCommunicator(ricci_agent)
+  map = {}
+  os_str = resolveOSType(rc.os())
+  map['os'] = os_str
+  map['isVirtualized'] = rc.dom0()
+  return map
 
 def getResourcesInfo(modelb, request):
 	resList = list()