CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: [email protected] 2009-03-09 21:27:19
Modified files:
luci/site/luci/Extensions: LuciClusterInfo.py
luci/site/luci/var: Data.fs
ricci/modules/rpm: PackageHandler.cpp
Log message:
Update the zope db
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciClusterInfo.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.4.15&r2=1.1.4.16
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/var/Data.fs.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.15.2.40&r2=1.15.2.41
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.9.2.13&r2=1.9.2.14
--- conga/luci/site/luci/Extensions/LuciClusterInfo.py 2009/02/16 17:23:28
1.1.4.15
+++ conga/luci/site/luci/Extensions/LuciClusterInfo.py 2009/03/09 21:26:41
1.1.4.16
@@ -594,6 +594,7 @@
clumap = {}
+ clumap['has_ignore_undef_fence'] = False
try:
cluster_os = model.getClusterOS()
if cluster_os.find('Tikanga') != -1:
@@ -604,7 +605,7 @@
clumap['vm_migration_choice'] = True
if os_minor > 2:
clumap['has_fence_ssh'] = True
- clumap['has_ignore_undef_fence'] = True
+ #clumap['has_ignore_undef_fence'] = True
elif cluster_os.find('Nahant') != -1:
clumap['os_major'] = 4
os_minor = int(cluster_os[cluster_os.find('Update ') +
7])
Binary files /cvs/cluster/conga/luci/site/luci/var/Data.fs 2009/01/29
16:22:09 1.15.2.40 and /cvs/cluster/conga/luci/site/luci/var/Data.fs
2009/03/09 21:26:41 1.15.2.41 differ
rcsdiff: /cvs/cluster/conga/luci/site/luci/var/Data.fs: diff failed
--- conga/ricci/modules/rpm/PackageHandler.cpp 2009/03/09 20:20:58 1.9.2.13
+++ conga/ricci/modules/rpm/PackageHandler.cpp 2009/03/09 21:27:19 1.9.2.14
@@ -506,11 +506,11 @@
}
} else if (RHEL5 || FC6) {
set.packages.push_back("gfs2-utils");
+ set.packages.push_back("cmirror");
if (RHEL5) {
set.packages.push_back("gfs-utils");
if (kernel.find("xen") == kernel.npos) {
set.packages.push_back("kmod-gfs");
- set.packages.push_back("cmirror");
set.packages.push_back("kmod-cmirror");
} else {
set.packages.push_back("kmod-gfs-xen");
