CVSROOT: /cvs/cluster
Module name: conga
Changes by: [EMAIL PROTECTED] 2007-10-09 21:41:46
Modified files:
. : conga.spec.in.in
luci/site/luci/Extensions: LuciClusterActions.py
Log message:
Fixed bz320411 (conga should use the node name in cluster.conf and not
FQDN for fencing)
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.87&r2=1.88
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciClusterActions.py.diff?cvsroot=cluster&r1=1.7&r2=1.8
--- conga/conga.spec.in.in 2007/10/09 21:31:05 1.87
+++ conga/conga.spec.in.in 2007/10/09 21:41:46 1.88
@@ -297,6 +297,7 @@
- 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)
+- Fixed bz320411 (conga should use the node name in cluster.conf and not FQDN
for fencing)
* Mon Aug 27 2007 Ryan McCabe <[EMAIL PROTECTED]> 0.10.0-6
- Fixed bz253783
--- conga/luci/site/luci/Extensions/LuciClusterActions.py 2007/09/28
05:36:39 1.7
+++ conga/luci/site/luci/Extensions/LuciClusterActions.py 2007/10/09
21:41:46 1.8
@@ -613,10 +613,10 @@
if rc is None:
if LUCI_DEBUG_MODE is True:
luci_log.debug_verbose('FNF0: no ricci to fence %s for
cluster %s' \
- % (nodename_resolved, clustername))
+ % (nodename, clustername))
return None
- batch_number, result = rq.nodeFence(rc, nodename_resolved)
+ batch_number, result = rq.nodeFence(rc, nodename)
if batch_number is None or result is None:
if LUCI_DEBUG_MODE is True:
luci_log.debug_verbose('FNF1: batch_number and/or
result is None')
@@ -626,7 +626,7 @@
set_node_flag(self, clustername, rc.hostname(),
str(batch_number), NODE_FENCE,
'Node "%s" is being fenced by node "%s"' \
- % (nodename_resolved, rc.hostname()))
+ % (nodename, rc.hostname()))
except Exception, e:
if LUCI_DEBUG_MODE is True:
luci_log.debug_verbose('FNF2: failed to set flags: %r
%s' \
