java/code
by jdob
java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java | 117 ++++------
1 file changed, 49 insertions(+), 68 deletions(-)
New commits:
commit 81a911525f938b5599fcd7f38017d7ecae1b5d6b
Author: Jason Dobies <jason.dobies(a)redhat.com>
Date: Wed Jun 3 15:55:39 2009 -0400
495594, 504012 - Fixed issue where invert flag disappeared on pagination; fixed ISE when search produces no results.
Also general clean up of the class.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java
index 80f74b0..6c25cb5 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java
@@ -16,7 +16,6 @@ package com.redhat.rhn.frontend.action.systems;
import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.localization.LocalizationService;
-import com.redhat.rhn.common.util.StringUtil;
import com.redhat.rhn.frontend.action.common.BadParameterException;
import com.redhat.rhn.frontend.dto.SystemSearchResult;
import com.redhat.rhn.frontend.struts.RequestContext;
@@ -55,12 +54,10 @@ import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcFault;
/**
- * SystemSearchAction extends RhnAction - Class representation of the table ###TABLE###.
- * @version $Rev: 1 $
+ * Action handling the advanced system search page.
*/
public class SystemSearchSetupAction extends RhnAction implements Listable {
- private static Logger log = Logger.getLogger(SystemSearchSetupAction.class);
-
+
public static final String LIST_NAME = "pageList";
public static final String DATA_SET = "searchResults";
@@ -133,6 +130,8 @@ public class SystemSearchSetupAction extends RhnAction implements Listable {
private static final String FORM = "FORM";
private static final String MAPPING = "MAPPING";
+
+ private final Logger log = Logger.getLogger(SystemSearchSetupAction.class);
/** {@inheritDoc} */
public ActionForward execute(ActionMapping mapping,
@@ -153,12 +152,26 @@ public class SystemSearchSetupAction extends RhnAction implements Listable {
if (ListTagHelper.getListAction(getListName(), request) != null ||
(!isSubmitted(daForm) &&
request.getParameter(VIEW_MODE) != null)) {
+
+ String whereToSearch = daForm.getString(WHERE_TO_SEARCH);
+ Boolean invertResults = (Boolean) daForm.get(INVERT_RESULTS);
+
+ if (invertResults == null) {
+ invertResults = Boolean.FALSE;
+ }
request.setAttribute(VIEW_MODE, request.getParameter(VIEW_MODE));
request.setAttribute(SEARCH_STRING, request.getParameter(SEARCH_STRING));
- setupForm(request, daForm, request.getParameter(VIEW_MODE));
-
+ request.setAttribute(WHERE_TO_SEARCH, whereToSearch);
+
+ if (invertResults) {
+ request.setAttribute(INVERT_RESULTS, "on");
+ }
+ else {
+ request.setAttribute(INVERT_RESULTS, "off");
+ }
+ setupForm(request, daForm, request.getParameter(VIEW_MODE));
ListRhnSetHelper helper = new ListRhnSetHelper(this,
request, RhnSetDecl.SYSTEMS);
@@ -168,7 +181,8 @@ public class SystemSearchSetupAction extends RhnAction implements Listable {
helper.execute();
List results = (List)request.getAttribute(getDataSetName());
- log.info("SystemSearch results.size() = " + results.size());
+ log.info("SystemSearch results.size() = " +
+ (results != null ? results.size() : "null results"));
if ((results != null) && (results.size() == 1)) {
SystemSearchResult s = (SystemSearchResult) results.get(0);
Double score = s.getScore();
@@ -195,8 +209,7 @@ public class SystemSearchSetupAction extends RhnAction implements Listable {
}
return getStrutsDelegate().forwardParams(
mapping.findForward("default"),
- request.getParameterMap());
-
+ request.getParameterMap());
}
/**
* Else the form was submitted, so we need to parse the form and turn it into
@@ -208,6 +221,10 @@ public class SystemSearchSetupAction extends RhnAction implements Listable {
String whereToSearch = daForm.getString(WHERE_TO_SEARCH);
Boolean invertResults = (Boolean) daForm.get(INVERT_RESULTS);
+ if (invertResults == null) {
+ invertResults = Boolean.FALSE;
+ }
+
setupForm(request, daForm, viewMode);
if (whereToSearch == null || viewMode == null) {
throw new BadParameterException("An expected form var was null");
@@ -215,18 +232,25 @@ public class SystemSearchSetupAction extends RhnAction implements Listable {
request.setAttribute(SEARCH_STRING, searchString);
request.setAttribute(VIEW_MODE, viewMode);
- request.setAttribute(INVERT_RESULTS, invertResults);
request.setAttribute(WHERE_TO_SEARCH, whereToSearch);
+
+ if (invertResults) {
+ request.setAttribute(INVERT_RESULTS, "on");
+ }
+ else {
+ request.setAttribute(INVERT_RESULTS, "off");
+ }
+
ActionErrors errs = new ActionErrors();
if (viewMode.equals("systemsearch_id") ||
- viewMode.equals(SystemSearchHelper.CPU_MHZ_LT) ||
- viewMode.equals(SystemSearchHelper.CPU_MHZ_GT) ||
- viewMode.equals(SystemSearchHelper.RAM_LT) ||
- viewMode.equals(SystemSearchHelper.RAM_GT) ||
- viewMode.equals(SystemSearchHelper.NUM_CPUS_LT) ||
- viewMode.equals(SystemSearchHelper.NUM_CPUS_GT) ||
- viewMode.equals(SystemSearchHelper.CHECKIN) ||
- viewMode.equals(SystemSearchHelper.REGISTERED)) {
+ viewMode.equals(SystemSearchHelper.CPU_MHZ_LT) ||
+ viewMode.equals(SystemSearchHelper.CPU_MHZ_GT) ||
+ viewMode.equals(SystemSearchHelper.RAM_LT) ||
+ viewMode.equals(SystemSearchHelper.RAM_GT) ||
+ viewMode.equals(SystemSearchHelper.NUM_CPUS_LT) ||
+ viewMode.equals(SystemSearchHelper.NUM_CPUS_GT) ||
+ viewMode.equals(SystemSearchHelper.CHECKIN) ||
+ viewMode.equals(SystemSearchHelper.REGISTERED)) {
String regEx = "(\\d)*";
Pattern pattern = Pattern.compile(regEx);
Matcher matcher = pattern.matcher(searchString);
@@ -276,8 +300,6 @@ public class SystemSearchSetupAction extends RhnAction implements Listable {
}
}
-
-
protected void setupForm(HttpServletRequest request,
DynaActionForm form,
@@ -314,11 +336,9 @@ public class SystemSearchSetupAction extends RhnAction implements Listable {
request.setAttribute("optGroupsKeys", optGroupsMap.keySet());
}
-
protected DataResult performSearch(RequestContext context) {
HttpServletRequest request = context.getRequest();
- ActionMapping mapping = (ActionMapping) request.getAttribute(MAPPING);
String searchString = context.getParam(SEARCH_STRING, false);
String viewMode = context.getParam(VIEW_MODE, false);
String whereToSearch = context.getParam(WHERE_TO_SEARCH, false);
@@ -390,55 +410,30 @@ public class SystemSearchSetupAction extends RhnAction implements Listable {
* @return Returns the map.
*/
private Map createDisplayMap(String display, String value) {
- Map selection = new HashMap();
+ Map<String, String> selection = new HashMap<String, String>();
selection.put("display", display);
selection.put("value", value);
return selection;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getListName() {
return LIST_NAME;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getDataSetName() {
return DATA_SET;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getDecl(RequestContext context) {
return RhnSetDecl.SYSTEMS.getLabel();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public List getResult(RequestContext context) {
- /*String cachedName = makeKey(context);
- List result = (List)context.getRequest().getSession().getAttribute(cachedName);
- if (result != null) {
- return result;
- }*/
-
- /*
- DynaActionForm daForm = (DynaActionForm) context.getRequest().getAttribute(FORM);
- String searchString = daForm.getString(SEARCH_STRING);
- String viewMode = daForm.getString(VIEW_MODE);
- String whereToSearch = daForm.getString(WHERE_TO_SEARCH);
- Boolean invertResults = (Boolean) daForm.get(INVERT_RESULTS); */
-
String searchString = context.getParam(SEARCH_STRING, false);
- String viewMode = context.getParam(VIEW_MODE, false);
- String whereToSearch = context.getParam(WHERE_TO_SEARCH, false);
- Boolean invertResults = StringUtils.defaultString(
- context.getParam(INVERT_RESULTS, false)).equals("on");
if (!StringUtils.isBlank(searchString)) {
log.info("SystemSearchSetupAction.getResult() calling performSearch()");
@@ -448,21 +443,7 @@ public class SystemSearchSetupAction extends RhnAction implements Listable {
return Collections.EMPTY_LIST;
}
- private String makeKey(RequestContext context) {
- DynaActionForm daForm = (DynaActionForm) context.getRequest().getAttribute(FORM);
- String searchString = daForm.getString(SEARCH_STRING);
- String viewMode = daForm.getString(VIEW_MODE);
- String whereToSearch = daForm.getString(WHERE_TO_SEARCH);
- Boolean invertResults = (Boolean) daForm.get(INVERT_RESULTS);
-
- return StringUtil.toJson(new Object [] {
- searchString, viewMode, whereToSearch, invertResults
- });
- }
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getParentUrl(RequestContext context) {
return context.getRequest().getRequestURI();
}
14 years, 12 months
client/rhel
by Pradeep Kilambi
client/rhel/rhnsd/rhnsd.init | 2 +-
client/rhel/rhnsd/rhnsd.spec | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit f38d9b72ed72e05a50c5c22b3441ffef334d0545
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Wed Jun 3 14:34:04 2009 -0400
243699: fixing the error code when unknown command is used with rhnsd init
diff --git a/client/rhel/rhnsd/rhnsd.init b/client/rhel/rhnsd/rhnsd.init
index e5143de..b98e004 100644
--- a/client/rhel/rhnsd/rhnsd.init
+++ b/client/rhel/rhnsd/rhnsd.init
@@ -78,6 +78,6 @@ case "$1" in
;;
*)
echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
- ;;
+ exit 1
esac
exit $RETVAL
diff --git a/client/rhel/rhnsd/rhnsd.spec b/client/rhel/rhnsd/rhnsd.spec
index e4fe44c..d3bab98 100644
--- a/client/rhel/rhnsd/rhnsd.spec
+++ b/client/rhel/rhnsd/rhnsd.spec
@@ -58,6 +58,9 @@ rm -fr $RPM_BUILD_ROOT
%{_mandir}/man8/rhnsd.8*
%changelog
+* Wed Jun 3 2009 Pradeep Kilambi <pkilambi(a)redhat.com> 4.7.0-3
+- Resolves: #243699 -fixing error code for unknown command to rhnsd init script
+
* Mon May 11 2009 Pradeep Kilambi <pkilambi(a)redhat.com> 4.7.0-2
- Updated translations.
- Resolves: #243699
14 years, 12 months
Branch 'VADER' - web/html
by Shannon Hughes
web/html/network/systems/details/hardware.pxt | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
New commits:
commit ee752edd279724c73fb16931f94bafb82c95d997
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Wed Jun 3 13:49:00 2009 -0400
197294 - add hardware report support for CAPTURE cards
diff --git a/web/html/network/systems/details/hardware.pxt b/web/html/network/systems/details/hardware.pxt
index d944472..bf15eea 100644
--- a/web/html/network/systems/details/hardware.pxt
+++ b/web/html/network/systems/details/hardware.pxt
@@ -243,6 +243,30 @@
</table>
</rhn-server-device>
+<rhn-server-device class="CAPTURE">
+ <h2>CAPTURE</h2>
+
+ <table class="list" width="90%" cellspacing="0">
+ <thead>
+ <tr>
+ <th width="40%">Description</th>
+ <th width="10%">Bus</th>
+ <th width="25%">Vendor</th>
+ <th width="25%">Driver</th>
+ </tr>
+ </thead>
+
+<rhn-device-data>
+ <tr class="{row_class}">
+ <td class="first-column">{capture_description}</td>
+ <td>{capture_bus}</td>
+ <td>{capture_vendorstring}</td>
+ <td class="last-column">{capture_driver}</td>
+ </tr>
+</rhn-device-data>
+ </table>
+</rhn-server-device>
+
<rhn-server-device class="OTHER">
<h2>Misc</h2>
14 years, 12 months
web/html
by Shannon Hughes
web/html/network/systems/details/hardware.pxt | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
New commits:
commit bc4aa9ff57bf9943508b629004b5d8ad206ad426
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Wed Jun 3 13:49:00 2009 -0400
197294 - add hardware report support for CAPTURE cards
diff --git a/web/html/network/systems/details/hardware.pxt b/web/html/network/systems/details/hardware.pxt
index d944472..bf15eea 100644
--- a/web/html/network/systems/details/hardware.pxt
+++ b/web/html/network/systems/details/hardware.pxt
@@ -243,6 +243,30 @@
</table>
</rhn-server-device>
+<rhn-server-device class="CAPTURE">
+ <h2>CAPTURE</h2>
+
+ <table class="list" width="90%" cellspacing="0">
+ <thead>
+ <tr>
+ <th width="40%">Description</th>
+ <th width="10%">Bus</th>
+ <th width="25%">Vendor</th>
+ <th width="25%">Driver</th>
+ </tr>
+ </thead>
+
+<rhn-device-data>
+ <tr class="{row_class}">
+ <td class="first-column">{capture_description}</td>
+ <td>{capture_bus}</td>
+ <td>{capture_vendorstring}</td>
+ <td class="last-column">{capture_driver}</td>
+ </tr>
+</rhn-device-data>
+ </table>
+</rhn-server-device>
+
<rhn-server-device class="OTHER">
<h2>Misc</h2>
14 years, 12 months
Branch 'VADER' - java/code
by Brad Buckingham
java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 38ceef06c4f1180b4ded22a792e4e887427ed406
Author: Brad Buckingham <bbuckingham(a)redhat.com>
Date: Wed Jun 3 11:38:23 2009 -0400
503642 - update KickstartScheduleCommand to store action id after the action has been saved to the db
This change was needed to address a null pointer exception that occured
whenever a user would execute the XMLRPC API system.provisionSystem.
In the past, the Action was saved immediately following scheduleKickstartAction;however, in a commit earlier in the release, this save was moved further down
in the logic. This is Ok; however, the logic which stored the action id in
the object (i.e. this.kickstartActionId) was not moved. As a result, the
action id was stored as null, because the action id does not exist until
the Action is saved to the database.
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
index 36a9a59..28bf6a5 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
@@ -573,10 +573,6 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
Action kickstartAction = this.scheduleKickstartAction(packageAction);
ActionFactory.save(packageAction);
-
- this.kickstartActionId = kickstartAction.getId();
- log.debug("** Created ksaction: " + kickstartAction.getId());
-
scheduleRebootAction(kickstartAction);
String host = this.getKickstartServerName();
@@ -613,7 +609,6 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
}
}
-
SystemRecord rec = SystemRecord.lookupById(CobblerXMLRPCHelper.getConnection(
this.getUser().getLogin()), this.getServer().getCobblerId());
@@ -625,8 +620,10 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
setCobblerSystemName(rec.getName());
}
-
ActionFactory.save(kickstartAction);
+ log.debug("** Created ksaction: " + kickstartAction.getId());
+
+ this.kickstartActionId = kickstartAction.getId();
log.debug("** Done scheduling kickstart session");
return null;
14 years, 12 months
java/code
by Brad Buckingham
java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit fd6fcd79e5efcd6401fad67c87a95e4b04e17e5c
Author: Brad Buckingham <bbuckingham(a)redhat.com>
Date: Wed Jun 3 11:38:23 2009 -0400
503642 - update KickstartScheduleCommand to store action id after the action has been saved to the db
This change was needed to address a null pointer exception that occured
whenever a user would execute the XMLRPC API system.provisionSystem.
In the past, the Action was saved immediately following scheduleKickstartAction;however, in a commit earlier in the release, this save was moved further down
in the logic. This is Ok; however, the logic which stored the action id in
the object (i.e. this.kickstartActionId) was not moved. As a result, the
action id was stored as null, because the action id does not exist until
the Action is saved to the database.
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
index 36a9a59..28bf6a5 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
@@ -573,10 +573,6 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
Action kickstartAction = this.scheduleKickstartAction(packageAction);
ActionFactory.save(packageAction);
-
- this.kickstartActionId = kickstartAction.getId();
- log.debug("** Created ksaction: " + kickstartAction.getId());
-
scheduleRebootAction(kickstartAction);
String host = this.getKickstartServerName();
@@ -613,7 +609,6 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
}
}
-
SystemRecord rec = SystemRecord.lookupById(CobblerXMLRPCHelper.getConnection(
this.getUser().getLogin()), this.getServer().getCobblerId());
@@ -625,8 +620,10 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
setCobblerSystemName(rec.getName());
}
-
ActionFactory.save(kickstartAction);
+ log.debug("** Created ksaction: " + kickstartAction.getId());
+
+ this.kickstartActionId = kickstartAction.getId();
log.debug("** Done scheduling kickstart session");
return null;
14 years, 12 months
Branch 'VADER' - java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2bbe04a810087f247cbaaab4e83fce83dfd81eea
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Jun 3 11:31:36 2009 -0400
502905 - fixing issue where non virt kickstarts would show up on virt provisioning page
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
index 827b90a..1c82147 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
@@ -69,7 +69,7 @@ ORDER BY KS.label, KS.id
AND KT.channel_id = C.id
AND ( C.channel_arch_id = :prim_arch_id OR C.channel_arch_id = :sec_arch_id )
AND KSD.virtualization_type = KVT.id
- AND KVT.label not in ('auto','para_host')
+ AND KVT.label not in ('none','para_host')
ORDER BY KS.label, KS.id
</query>
</mode>
14 years, 12 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 686969bf42523a88fe79d58f31606e5ba461f18f
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Jun 3 11:31:36 2009 -0400
502905 - fixing issue where non virt kickstarts would show up on virt provisioning page
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
index 827b90a..1c82147 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
@@ -69,7 +69,7 @@ ORDER BY KS.label, KS.id
AND KT.channel_id = C.id
AND ( C.channel_arch_id = :prim_arch_id OR C.channel_arch_id = :sec_arch_id )
AND KSD.virtualization_type = KVT.id
- AND KVT.label not in ('auto','para_host')
+ AND KVT.label not in ('none','para_host')
ORDER BY KS.label, KS.id
</query>
</mode>
14 years, 12 months
Branch 'VADER' - spacewalk/setup
by Milan Zazrivec
spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl | 8 --------
1 file changed, 8 deletions(-)
New commits:
commit 843583d37d9ebc2b21131d97a7b1b64856dabce8
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jun 3 17:17:55 2009 +0200
no need to enable Monitoring + MonitoringScout explicitly
Since Spacewalk 0.3, this is being done by spacewalk-setup
during upgrade (Spacewalk::Setup::setup_services).
diff --git a/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl b/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl
index dcebaab..61b1ef1 100644
--- a/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl
+++ b/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl
@@ -46,9 +46,6 @@ my $db_connect = RHN::SatInstall->test_db_connection();
die "Could not connect to the database"
unless $db_connect;
-print "Setting up Monitoring backend\n";
-RHN::SatInstall->setup_monitoring_sysv_step('Monitoring');
-
my $scout_shared_key = find_scout_key();
my $hostname = Sys::Hostname::hostname;
@@ -75,11 +72,6 @@ unless ($scout_shared_key) {
}
}
-if ($opts{"enable-scout"}) {
- print "Setting up Monitoring scout\n";
- RHN::SatInstall->setup_monitoring_sysv_step('MonitoringScout');
-}
-
my ($db_user, $db_pass, $db_name) = split_dsn(PXT::Config->get('default_db'));
my %config_opts;
14 years, 12 months
spacewalk/setup
by Milan Zazrivec
spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl | 8 --------
1 file changed, 8 deletions(-)
New commits:
commit 4e442cd7edec5eb432a8d964bcfb11068d0cd4f8
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jun 3 17:17:55 2009 +0200
no need to enable Monitoring + MonitoringScout explicitly
Since Spacewalk 0.3, this is being done by spacewalk-setup
during upgrade (Spacewalk::Setup::setup_services).
diff --git a/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl b/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl
index dcebaab..61b1ef1 100644
--- a/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl
+++ b/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl
@@ -46,9 +46,6 @@ my $db_connect = RHN::SatInstall->test_db_connection();
die "Could not connect to the database"
unless $db_connect;
-print "Setting up Monitoring backend\n";
-RHN::SatInstall->setup_monitoring_sysv_step('Monitoring');
-
my $scout_shared_key = find_scout_key();
my $hostname = Sys::Hostname::hostname;
@@ -75,11 +72,6 @@ unless ($scout_shared_key) {
}
}
-if ($opts{"enable-scout"}) {
- print "Setting up Monitoring scout\n";
- RHN::SatInstall->setup_monitoring_sysv_step('MonitoringScout');
-}
-
my ($db_user, $db_pass, $db_name) = split_dsn(PXT::Config->get('default_db'));
my %config_opts;
14 years, 12 months