From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 14 Apr 2008 15:55:10 -0000 Subject: [Cluster-devel] conga ./conga.spec.in.in ricci/modules/cluster ... Message-ID: <20080414155510.5775.qmail@sourceware.org> List-Id: 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 Branch: RHEL4 Changes by: rmccabe at sourceware.org 2008-04-14 15:55:09 Modified files: . : conga.spec.in.in ricci/modules/cluster: ClusterStatus.cpp ricci/modules/rpm: PackageHandler.cpp ricci/modules/service: ServiceManager.cpp Log message: Fix bz442369: conga should install 'sg3_utils' and start service 'scsi_reserve' when scsi fencing is used Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67.2.23&r2=1.67.2.24 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/ClusterStatus.cpp.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.16.2.4&r2=1.16.2.5 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.cpp.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.11.2.4&r2=1.11.2.5 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/ServiceManager.cpp.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.7.2.4&r2=1.7.2.5 --- conga/conga.spec.in.in 2008/04/11 06:48:10 1.67.2.23 +++ conga/conga.spec.in.in 2008/04/14 15:55:08 1.67.2.24 @@ -301,6 +301,7 @@ %changelog * Tue Mar 25 2008 Ryan McCabe 0.11.1-2 +- Fix bz442369 (conga should install 'sg3_utils' and start service 'scsi_reserve' when scsi fencing is used) - Fix bz441574 (nodename" field for fence_scsi disabled when adding a new fence device/instance) - Fix bz349561 (Add Conga support for Oracle Resource Agent) - Fix bz369131 (RFE: should only have to enter a system's password once) --- conga/ricci/modules/cluster/ClusterStatus.cpp 2008/03/25 01:27:15 1.16.2.4 +++ conga/ricci/modules/cluster/ClusterStatus.cpp 2008/04/14 15:55:08 1.16.2.5 @@ -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/03/25 01:27:18 1.11.2.4 +++ conga/ricci/modules/rpm/PackageHandler.cpp 2008/04/14 15:55:08 1.11.2.5 @@ -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/03/25 01:27:19 1.7.2.4 +++ conga/ricci/modules/service/ServiceManager.cpp 2008/04/14 15:55:08 1.7.2.5 @@ -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))