CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: [EMAIL PROTECTED] 2008-02-12 17:40:39
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 432533 and 432534
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.18.2.31&r2=1.18.2.32
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.68&r2=1.45.2.69
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.33&r2=1.21.2.34
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/ClusterStatus.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.15.2.5&r2=1.15.2.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/log/LogParser.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.6.2.5&r2=1.6.2.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.9.2.7&r2=1.9.2.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/ServiceManager.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.5.2.5&r2=1.5.2.6
--- conga/clustermon.spec.in.in 2008/01/29 22:02:12 1.18.2.31
+++ conga/clustermon.spec.in.in 2008/02/12 17:40:38 1.18.2.32
@@ -193,6 +193,9 @@
%changelog
+* Tue Feb 12 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.12.0-5
+- Fix bz432534 (clustermon should not attempt to start or stop the cmirror
service)
+
* 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
--- conga/conga.spec.in.in 2008/02/08 21:56:33 1.45.2.68
+++ conga/conga.spec.in.in 2008/02/12 17:40:38 1.45.2.69
@@ -292,6 +292,9 @@
### changelog ###
%changelog
+* Tue Feb 12 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.12.0-5
+- Fix bz432533 (Do not attempt to install the cmirror package when shared
storage is requested)
+
* Fri Feb 08 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.12.0-4
- Fix bz429151 ([RFE] Luci: increase min password length to 6 characters)
- Fix bz429152 ([RFE] add inactivity timeout)
--- conga/make/version.in 2008/02/08 21:59:48 1.21.2.33
+++ conga/make/version.in 2008/02/12 17:40:38 1.21.2.34
@@ -1,2 +1,2 @@
VERSION=0.12.0
-RELEASE=4
+RELEASE=5
--- conga/ricci/modules/cluster/ClusterStatus.cpp 2008/01/29 22:02:12
1.15.2.5
+++ conga/ricci/modules/cluster/ClusterStatus.cpp 2008/02/12 17:40:38
1.15.2.6
@@ -263,7 +263,6 @@
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);
@@ -276,7 +275,6 @@
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/29 22:02:13 1.6.2.5
+++ conga/ricci/modules/log/LogParser.cpp 2008/02/12 17:40:38 1.6.2.6
@@ -47,7 +47,6 @@
"lock_gulmd_LTPX",
"cman",
"cman_tool",
- "cmirror",
"ccs",
"ccs_tool",
"ccsd",
@@ -83,7 +82,6 @@
"lvm",
"clvm",
"clvmd",
- "cmirror",
"end_request",
"buffer",
"scsi",
--- conga/ricci/modules/rpm/PackageHandler.cpp 2008/01/29 22:02:13 1.9.2.7
+++ conga/ricci/modules/rpm/PackageHandler.cpp 2008/02/12 17:40:39 1.9.2.8
@@ -507,7 +507,6 @@
set.packages.push_back("gfs2-utils");
if (RHEL5) {
set.packages.push_back("gfs-utils");
- set.packages.push_back("cmirror");
if (kernel.find("xen") == kernel.npos) {
set.packages.push_back("kmod-gfs");
set.packages.push_back("kmod-gfs2");
--- conga/ricci/modules/service/ServiceManager.cpp 2008/01/29 22:02:13
1.5.2.5
+++ conga/ricci/modules/service/ServiceManager.cpp 2008/02/12 17:40:39
1.5.2.6
@@ -522,8 +522,6 @@
} 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");
}
