[Cluster-devel] conga/luci/site/luci/Extensions homebase_adapt ...

[rmccabe@sourceware.org <rmccabe@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-06-27 20:47:35

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

Log message:
	fix adding hosts in clusters, use user-supplied hostname instead of the one ricci returns

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

--- conga/luci/site/luci/Extensions/homebase_adapters.py	2006/06/27 17:49:17	1.7
+++ conga/luci/site/luci/Extensions/homebase_adapters.py	2006/06/27 20:47:34	1.8
@@ -611,9 +611,9 @@
 	except:
 		return 'Unable to authenticate to the ricci agent on \"' + host + '\"'
 
-	rhost = rc.system_name()
-	if rhost and rhost != host:
-		host = rhost
+#	rhost = rc.system_name()
+#	if rhost and rhost != host:
+#		host = rhost
 
 	try:
 		exists = self.restrictedTraverse(PLONE_ROOT +'/systems/storage/' + host)
@@ -641,9 +641,9 @@
 	except:
 		return 'Unable to set permissions on new system \"' + host + '\"'
 
-	cluster_info = rc.cluster_info()
-	if cluster_info[0] != '':
-		raise InCluster, host
+#	cluster_info = rc.cluster_info()
+#	if cluster_info[0] != '':
+#		raise InCluster, host
 
 
 def createCluster(self, clusterName):
@@ -691,9 +691,9 @@
 	if i != True:
 		return 'Authentication for host \"' + host + '\" failed'
 
-	rhost = rc.system_name()
-	if rhost and rhost != host:
-		host = rhost
+#	rhost = rc.system_name()
+#	if rhost and rhost != host:
+#		host = rhost
 
 	cluster_info = rc.cluster_info()
 	if len(cluster_info) > 0 and cluster_info[0] != '' and  cluster_info[0] != cluster: