CVSROOT: /cvs/cluster Module name: conga Branch: RHEL5 Changes by: [EMAIL PROTECTED] 2008-04-14 15:58:35
Modified files: . : conga.spec.in.in luci/site/luci/Extensions: StorageReport.py ricci/modules/cluster: ClusterStatus.cpp ricci/modules/rpm: PackageHandler.cpp ricci/modules/service: ServiceManager.cpp Log message: fix bz441580: 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=RHEL5&r1=1.45.2.77&r2=1.45.2.78 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/StorageReport.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.20.2.7&r2=1.20.2.8 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/ClusterStatus.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.15.2.6&r2=1.15.2.7 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.9.2.8&r2=1.9.2.9 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/ServiceManager.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.5.2.6&r2=1.5.2.7 --- conga/conga.spec.in.in 2008/04/11 06:54:43 1.45.2.77 +++ conga/conga.spec.in.in 2008/04/14 15:58:35 1.45.2.78 @@ -292,6 +292,7 @@ ### changelog ### %changelog * Thu Apr 10 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.12.0-8 +- Fix bz441580 (conga should install 'sg3_utils' and start service 'scsi_reserve' when scsi fencing is used) - Fix bz441573 ("nodename" field for fence_scsi disabled when adding a new fence device/instance) * Wed Feb 27 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.12.0-6 --- conga/luci/site/luci/Extensions/StorageReport.py 2008/01/23 04:44:32 1.20.2.7 +++ conga/luci/site/luci/Extensions/StorageReport.py 2008/04/14 15:58:35 1.20.2.8 @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2007 Red Hat, Inc. +# Copyright (C) 2006-2008 Red Hat, Inc. # # This program is free software; you can redistribute # it and/or modify it under the terms of version 2 of the --- conga/ricci/modules/cluster/ClusterStatus.cpp 2008/02/12 17:40:38 1.15.2.6 +++ conga/ricci/modules/cluster/ClusterStatus.cpp 2008/04/14 15:58:35 1.15.2.7 @@ -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:40:39 1.9.2.8 +++ conga/ricci/modules/rpm/PackageHandler.cpp 2008/04/14 15:58:35 1.9.2.9 @@ -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:40:39 1.5.2.6 +++ conga/ricci/modules/service/ServiceManager.cpp 2008/04/14 15:58:35 1.5.2.7 @@ -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))