CVSROOT: /cvs/cluster
Module name: conga
Changes by: [EMAIL PROTECTED] 2007-10-09 21:31:05
Modified files:
. : conga.spec.in.in
luci/site/luci/Extensions: cluster_adapters.py
Log message:
Fix 315631: 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&r1=1.86&r2=1.87
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.272&r2=1.273
--- conga/conga.spec.in.in 2007/10/09 20:57:35 1.86
+++ conga/conga.spec.in.in 2007/10/09 21:31:05 1.87
@@ -296,6 +296,7 @@
- Fixed bz253223 (When deleting a node from conga, the fence device isn't
deleted)
- Fixed bz253879 (RFE: drop the link/details column in the resource section
table)
- Fixed bz249619 (luci "Manage Systems and Clusters" display of clusters and
storage systems is cascaded)
+- Fixed bz315631 (conga doesn't handle the cluster restart operation properly)
* Mon Aug 27 2007 Ryan McCabe <[EMAIL PROTECTED]> 0.10.0-6
- Fixed bz253783
--- conga/luci/site/luci/Extensions/cluster_adapters.py 2007/09/21 03:02:47
1.272
+++ conga/luci/site/luci/Extensions/cluster_adapters.py 2007/10/09 21:31:05
1.273
@@ -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, \
@@ -2308,14 +2308,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:
@@ -2325,8 +2327,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)
