CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: [EMAIL PROTECTED] 2008-01-29 22:02:13
Modified files:
. : clustermon.spec.in.in conga.spec.in.in
make : version.in
ricci/modules/cluster: ClusterStatus.cpp
ricci/modules/log: LogParser.cpp
ricci/modules/rpm: PackageHandler.cpp
ricci/modules/service: ServiceManager.cpp
Log message:
Fix 430737
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.18.2.30&r2=1.18.2.31
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.65&r2=1.45.2.66
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.30&r2=1.21.2.31
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/ClusterStatus.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.15.2.4&r2=1.15.2.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/log/LogParser.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.6.2.4&r2=1.6.2.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.9.2.6&r2=1.9.2.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/ServiceManager.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.5.2.4&r2=1.5.2.5
--- conga/clustermon.spec.in.in 2008/01/23 04:56:16 1.18.2.30
+++ conga/clustermon.spec.in.in 2008/01/29 22:02:12 1.18.2.31
@@ -193,6 +193,10 @@
%changelog
+* Mon Jan 28 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.12.0-2
+- Run the cmirror init script when starting cluster nodes that use shared
storage.
+- Related: bz430737
+
* Mon Jan 21 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.12.0-1
* Fixed bz317541 (Conga displays quorum status incorrectly when qdisk is used)
--- conga/conga.spec.in.in 2008/01/25 17:18:37 1.45.2.65
+++ conga/conga.spec.in.in 2008/01/29 22:02:12 1.45.2.66
@@ -292,6 +292,9 @@
### changelog ###
%changelog
+* Mon Jan 28 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.12.0-2
+- Fix bz430737 (Conga should install the 'cmirror' package when clustered
storage is requested)
+
* Fri Jan 25 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.12.0-1
- Fix a bug that prevented the fix for bz230462 from working
--- conga/make/version.in 2008/01/25 17:23:14 1.21.2.30
+++ conga/make/version.in 2008/01/29 22:02:12 1.21.2.31
@@ -1,2 +1,2 @@
VERSION=0.12.0
-RELEASE=1
+RELEASE=2
--- conga/ricci/modules/cluster/ClusterStatus.cpp 2008/01/17 17:38:37
1.15.2.4
+++ conga/ricci/modules/cluster/ClusterStatus.cpp 2008/01/29 22:02:12
1.15.2.5
@@ -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/17 17:38:38 1.6.2.4
+++ conga/ricci/modules/log/LogParser.cpp 2008/01/29 22:02:13 1.6.2.5
@@ -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 17:19:05 1.9.2.6
+++ conga/ricci/modules/rpm/PackageHandler.cpp 2008/01/29 22:02:13 1.9.2.7
@@ -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 17:19:05
1.5.2.4
+++ conga/ricci/modules/service/ServiceManager.cpp 2008/01/29 22:02:13
1.5.2.5
@@ -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");
}
