From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 13 Oct 2006 17:12:43 -0000
Subject: [Cluster-devel] conga/luci/site/luci/Extensions homebase_adapt ...
Message-ID: <20061013171243.7910.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:	rmccabe at sourceware.org	2006-10-13 17:12:41

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

Log message:
	allow removing a storage system, even if we're unable to talk to the ricci node that's [supposed to be] running on it

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

--- conga/luci/site/luci/Extensions/homebase_adapters.py	2006/10/13 17:04:11	1.30
+++ conga/luci/site/luci/Extensions/homebase_adapters.py	2006/10/13 17:12:41	1.31
@@ -1107,7 +1107,11 @@
 		if not rc:
 			raise
 	except:
-		return 'Unable to connect to the ricci agent on \"' + systemName + '\" to unauthenticate'
+		try:
+			ssystem.manage_delObjects([systemName])
+		except:
+			return 'Unable to delete the storage system \"' + systemName + '\"'
+		return
 
 	# Only unauthenticate if the system isn't a member of
 	# a managed cluster.