CVSROOT: /cvs/cluster
Module name: conga
Changes by: [EMAIL PROTECTED] 2008-01-30 17:12:16
Modified files:
ricci/modules/cluster: ClusterStatus.cpp
ricci/modules/log: LogParser.cpp
ricci/modules/rpm: PackageHandler.cpp
ricci/modules/service: ServiceManager.cpp
Log message:
sync up fixes from the RHEL5 branch
- install cmirror and kmod-gfs2|kmod-gfs2-xen on RHEL52 and beyond
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/ClusterStatus.cpp.diff?cvsroot=cluster&r1=1.25&r2=1.26
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/log/LogParser.cpp.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.cpp.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/ServiceManager.cpp.diff?cvsroot=cluster&r1=1.16&r2=1.17
--- conga/ricci/modules/cluster/ClusterStatus.cpp 2008/01/02 20:47:35
1.25
+++ conga/ricci/modules/cluster/ClusterStatus.cpp 2008/01/30 17:12:14
1.26
@@ -263,6 +263,7 @@
if (use_qdisk)
run_initd("qdiskd", true, false);
+ run_initd("cmirror", true, false);
run_initd("clvmd", true, false);
run_initd("gfs", true, false);
run_initd("gfs2", true, false);
@@ -275,6 +276,7 @@
run_chkconfig("qdiskd", true);
else
run_chkconfig("qdiskd", false);
+ run_chkconfig("cmirror", true);
run_chkconfig("clvmd", true);
run_chkconfig("gfs", true);
run_chkconfig("gfs2", true);
--- conga/ricci/modules/log/LogParser.cpp 2008/01/02 20:47:36 1.14
+++ conga/ricci/modules/log/LogParser.cpp 2008/01/30 17:12:14 1.15
@@ -47,6 +47,7 @@
"lock_gulmd_LTPX",
"cman",
"cman_tool",
+ "cmirror",
"ccs",
"ccs_tool",
"ccsd",
@@ -82,6 +83,7 @@
"lvm",
"clvm",
"clvmd",
+ "cmirror",
"end_request",
"buffer",
"scsi",
--- conga/ricci/modules/rpm/PackageHandler.cpp 2008/01/25 00:38:51 1.20
+++ conga/ricci/modules/rpm/PackageHandler.cpp 2008/01/30 17:12:14 1.21
@@ -507,10 +507,14 @@
set.packages.push_back("gfs2-utils");
if (RHEL5) {
set.packages.push_back("gfs-utils");
- if (kernel.find("xen") == kernel.npos)
+ set.packages.push_back("cmirror");
+ if (kernel.find("xen") == kernel.npos) {
set.packages.push_back("kmod-gfs");
- else
+ set.packages.push_back("kmod-gfs2");
+ } else {
set.packages.push_back("kmod-gfs-xen");
+ set.packages.push_back("kmod-gfs2-xen");
+ }
}
}
--- conga/ricci/modules/service/ServiceManager.cpp 2008/01/25 00:38:51
1.16
+++ conga/ricci/modules/service/ServiceManager.cpp 2008/01/30 17:12:15
1.17
@@ -522,6 +522,8 @@
} else if (RHEL5 || FC6) {
descr = "Shared Storage: clvmd, gfs, gfs2";
servs.push_back("clvmd");
+ if (RHEL5)
+ servs.push_back("cmirror");
servs.push_back("gfs");
servs.push_back("gfs2");
}
