[Cluster-devel] conga/luci/site/luci/Extensions LuciSyslog.py ...
rmccabe at sourceware.org
rmccabe at sourceware.org
Wed Nov 29 18:15:22 UTC 2006
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-11-29 18:15:20
Modified files:
luci/site/luci/Extensions: LuciSyslog.py StorageReport.py
cluster_adapters.py
Removed files:
luci/site/luci/Extensions: fence_test.py
Log message:
- make sure the 'agent' is in the form fence_X for fence device hashes
- improve the error message when attempting to create clustered storage on a node that does not support it
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciSyslog.py.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/StorageReport.py.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.169&r2=1.170
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/fence_test.py.diff?cvsroot=cluster&r1=1.1&r2=NONE
--- conga/luci/site/luci/Extensions/LuciSyslog.py 2006/11/12 02:10:53 1.10
+++ conga/luci/site/luci/Extensions/LuciSyslog.py 2006/11/29 18:15:20 1.11
@@ -78,6 +78,7 @@
def close(self):
try:
+ self.__init = 0
closelog()
except:
pass
--- conga/luci/site/luci/Extensions/StorageReport.py 2006/10/16 19:49:09 1.20
+++ conga/luci/site/luci/Extensions/StorageReport.py 2006/11/29 18:15:20 1.21
@@ -1409,7 +1409,7 @@
# clvmd error
error = True
url += '?' + STONAME + '=' + storagename + '&' + PAGETYPE + '=' + STORAGE
- msg = 'clvmd (clustered LVM daemon) is not running on ' + storagename + '. Start it and try again.'
+ msg = 'either clvmd (clustered LVM daemon) is not running or is not cluster-enabled on ' + storagename
elif code == 5:
# not quorate
error = True
--- conga/luci/site/luci/Extensions/cluster_adapters.py 2006/11/27 21:06:53 1.169
+++ conga/luci/site/luci/Extensions/cluster_adapters.py 2006/11/29 18:15:20 1.170
@@ -3331,6 +3331,7 @@
fencedev['pretty_name'] = FENCE_OPTS[fd.getAgentType()]
except:
fencedev['pretty_name'] = fd.getAgentType()
+ fencedev['agent'] = fd.getAgentType()
#Add config url for this fencedev
fencedev['cfgurl'] = baseurl + "?clustername=" + clustername + "&fencename=" + fd.getName().strip() + "&pagetype=" + FENCEDEV
More information about the Cluster-devel
mailing list