[Cluster-devel] conga ./conga.spec.in.in luci/site/luci/Extens ...

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

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2007-10-09 21:33:47

Modified files:
	.              : conga.spec.in.in 
	luci/site/luci/Extensions: cluster_adapters.py 

Log message:
	Fix bz325501 (conga doesn't handle the cluster restart operation properly)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67.2.17&r2=1.67.2.18
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.24&r2=1.227.2.25

--- conga/conga.spec.in.in	2007/09/21 03:24:12	1.67.2.17
+++ conga/conga.spec.in.in	2007/10/09 21:33:47	1.67.2.18
@@ -331,9 +331,11 @@
 - Fix bz253784
 - Fix bz253901 (No node IDs generated on new RHEL4 / DLM cluster)
 - Fix bz286951 (conga passes fence_scsi nodename, where as it accepts only node)
+- Fix bz325501 (conga doesn't handle the cluster restart operation properly)
 - Related: bz241417
 - Resolves: bz238727, bz241414, bz238656, bz245200, bz227723
 - Resolves: bz253905, bz253906, bz253784, bz253901, bz286951
+- Resolves: bz325501
 
 * Tue Apr 30 2007 Ryan McCabe <rmccabe@redhat.com> 0.9.1-9
 - Fix bz238656 (conga does not set the "nodename" attribute for manual fencing)
--- conga/luci/site/luci/Extensions/cluster_adapters.py	2007/08/24 21:55:42	1.227.2.24
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2007/10/09 21:33:47	1.227.2.25
@@ -34,7 +34,7 @@
 	CLUSTER_ADD, CLUSTER_CONFIG, CLUSTER_DAEMON, CLUSTER_DELETE, \
 	CLUSTER_FOLDER_PATH, CLUSTER_RESTART, CLUSTER_START, CLUSTER_STOP, \
 	DISABLE_SVC_TASK, ENABLE_SVC_TASK, FDOM, FDOM_ADD, FENCEDEV, \
-	FENCEDEV_NODE_CONFIG, FENCEDEVS, FLAG_DESC, INSTALL_TASK, \
+	FENCEDEV_NODE_CONFIG, FENCEDEVS, FLAG_DESC, INSTALL_TASK, CLUSTER_PROCESS, \
 	LAST_STATUS, LUCI_DEBUG_MODE, NODE, NODE_ADD, NODE_DELETE, \
 	NODE_FENCE, NODE_FORCE_DELETE, NODE_JOIN_CLUSTER, NODE_LEAVE_CLUSTER, \
 	NODE_REBOOT, NODES, POSSIBLE_REBOOT_MESSAGE, PRE_CFG, PRE_INSTALL, \
@@ -2327,14 +2327,16 @@
 			luci_log.debug('CTP0: no cluster task')
 		return 'No cluster task was given'
 
+	cluname = fvar['clustername']
 	if not model:
-		cluname = fvar['clustername']
 		model = LuciExtractCluModel(self, request, cluname)
 		if model is None:
 			if LUCI_DEBUG_MODE is True:
 				luci_log.debug_verbose('CTP2: No cluster model for %s' \
 					% cluname)
 			return 'Unable to retrieve the cluster configuration for %s. The configuration XML may contain errors.' % cluname
+	elif cluname is None:
+		cluname = model.getClusterName()
 
 	redirect_page = NODES
 	if task == CLUSTER_STOP:
@@ -2344,8 +2346,11 @@
 		from LuciClusterActions import ClusterStart
 		ClusterStart(self, model)
 	elif task == CLUSTER_RESTART:
-		from LuciClusterActions import ClusterRestart
-		ClusterRestart(self, model)
+		from LuciClusterActions import ClusterStop
+		ClusterStop(self, model)
+		request.RESPONSE.redirect('%s?pagetype=%s&clustername=%s&task=%s&busyfirst=true' \
+			% (baseurl, CLUSTER_PROCESS, cluname, CLUSTER_START))
+		return
 	elif task == CLUSTER_DELETE:
 		from LuciClusterActions import ClusterDelete
 		ret = ClusterDelete(self, model)