From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 12 May 2008 15:16:05 -0000
Subject: [Cluster-devel] conga ./clustermon.spec.in.in luci/site/luci/E ...
Message-ID: <20080512151605.22390.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2008-05-12 15:16:05

Modified files:
	.              : clustermon.spec.in.in 
	luci/site/luci/Extensions: ResourceHandler.py 
	ricci/modules/cluster: ClusterStatus.cpp 
	ricci/modules/rpm: PackageHandler.cpp 
	ricci/modules/service: ServiceManager.cpp 

Log message:
	Fixes from RHEL4 and RHEL5 branches

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&r1=1.42&r2=1.43
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ResourceHandler.py.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/ClusterStatus.cpp.diff?cvsroot=cluster&r1=1.27&r2=1.28
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.cpp.diff?cvsroot=cluster&r1=1.22&r2=1.23
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/ServiceManager.cpp.diff?cvsroot=cluster&r1=1.18&r2=1.19

--- conga/clustermon.spec.in.in	2008/04/23 19:27:25	1.42
+++ conga/clustermon.spec.in.in	2008/05/12 15:16:04	1.43
@@ -64,7 +64,7 @@
 Group: System Environment/Base
 Summary: Red Hat Enterprise Linux Cluster Suite - remote management
 
-Requires: cman oddjob dbus openssl
+Requires: oddjob dbus openssl
 Requires: initscripts util-linux
 Requires(post): chkconfig initscripts util-linux
 Requires(preun): chkconfig initscripts
--- conga/luci/site/luci/Extensions/ResourceHandler.py	2008/04/28 03:56:50	1.9
+++ conga/luci/site/luci/Extensions/ResourceHandler.py	2008/05/12 15:16:04	1.10
@@ -286,7 +286,7 @@
 		if nfstype != 'nfs' and nfstype != 'nfs4':
 			raise Exception, 'An invalid NFS version "%s" was given for "%s"' \
 								% (nfstype, rname)
-		res.addAttribute('nfstype', nfstype)
+		res.addAttribute('fstype', nfstype)
 	except Exception, e:
 		err = str(e)
 		errors.append(err)
--- conga/ricci/modules/cluster/ClusterStatus.cpp	2008/02/12 17:29:12	1.27
+++ conga/ricci/modules/cluster/ClusterStatus.cpp	2008/05/12 15:16:04	1.28
@@ -218,6 +218,7 @@
 		run_initd("clvmd", true, false);
 		run_initd("gfs", true, false);
 		run_initd("rgmanager", true, true);
+		run_initd("scsi_reserve", true, false);
 
 		if (enable_services) {
 			// enable them on boot
@@ -239,6 +240,7 @@
 			run_chkconfig("clvmd", true);
 			run_chkconfig("gfs", true);
 			run_chkconfig("rgmanager", true);
+			run_chkconfig("scsi_reserve", true);
 		}
 	} else if (stat.get_attr("cluster_version") == "5") {
 		try {
@@ -266,6 +268,7 @@
 		run_initd("clvmd", true, false);
 		run_initd("gfs", true, false);
 		run_initd("gfs2", true, false);
+		run_initd("scsi_reserve", true, false);
 		run_initd("rgmanager", true, true);
 
 		if (enable_services) {
@@ -278,6 +281,7 @@
 			run_chkconfig("clvmd", true);
 			run_chkconfig("gfs", true);
 			run_chkconfig("gfs2", true);
+			run_chkconfig("scsi_reserve", true);
 			run_chkconfig("rgmanager", true);
 		}
 	} else {
--- conga/ricci/modules/rpm/PackageHandler.cpp	2008/02/12 17:29:13	1.22
+++ conga/ricci/modules/rpm/PackageHandler.cpp	2008/05/12 15:16:04	1.23
@@ -493,6 +493,7 @@
 
 	PackageSet set("Clustered Storage");
 	set.packages.push_back("lvm2-cluster");
+	set.packages.push_back("sg3_utils");
 
 	if (RHEL4 || FC5) {
 		set.packages.push_back("GFS");
--- conga/ricci/modules/service/ServiceManager.cpp	2008/02/12 17:29:13	1.18
+++ conga/ricci/modules/service/ServiceManager.cpp	2008/05/12 15:16:05	1.19
@@ -519,11 +519,13 @@
 		descr = "Shared Storage: clvmd, gfs";
 		servs.push_back("clvmd");
 		servs.push_back("gfs");
+		servs.push_back("scsi_reserve");
 	} else if (RHEL5 || FC6) {
 		descr = "Shared Storage: clvmd, gfs, gfs2";
 		servs.push_back("clvmd");
 		servs.push_back("gfs");
 		servs.push_back("gfs2");
+		servs.push_back("scsi_reserve");
 	}
 	s = ServiceSet(name, descr);
 	if (populate_set(s, servs))