spacewalk/setup/bin/spacewalk-setup | 23 ----------------------- 1 file changed, 23 deletions(-)
New commits: commit e13a759d6d38f9a4501a226976625439428d0353 Author: Miroslav Suchý msuchy@redhat.com Date: Fri May 29 13:44:33 2009 +0200
502475 - remove initialization of scout from perl
java code from code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java do it for us now (cherry picked from commit 311273317beb8f8539b50d2e281287751e3cb90f)
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index 4fe73c2..df3a956 100644 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -39,10 +39,7 @@ use Getopt::Long; use Spacewalk::Setup; use Fcntl qw(F_GETFD F_SETFD FD_CLOEXEC);
-use RHN::SatInstall; -use RHN::SatCluster; use RHN::DB; -use RHN::Utils;
my $DEBUG; $DEBUG = 0; @@ -1115,26 +1112,6 @@ sub setup_monitoring { update_monitoring_config($answers, %mon_config); update_monitoring_environment($answers);
- my $scout; - eval { # scout on Satellite has always ID = 1 - $scout = RHN::SatCluster->lookup(-recid => 1); - }; - if ($@) { #scout does not exist, lets create new - my $ip_addr = RHN::Utils::find_ip_address($answers->{'hostname'}); - my $org_id = RHN::SatInstall->get_satellite_org_id(); - $scout = new RHN::SatCluster(customer_id => $org_id, - description => 'RHN Monitoring Satellite', - last_update_user => 'installer', - vip => $ip_addr, - ); - $scout->create_new(); - } else { - print Spacewalk::Setup::loc("** Skipping scout creation. Already created.\n"); - } - - my $scout_shared_key = RHN::SatCluster->fetch_key($scout->recid); - write_config({ monitoringDOTscout_shared_key => $scout_shared_key }, Spacewalk::Setup::DEFAULT_SATCON_DICT); - # Bugzilla 466747: On s390x, stty: standard input: Bad file descriptor # For some reason DBI mistakenly sets FD_CLOEXEC on a stdin file descriptor # here. This made it impossible for us to succesfully call `stty -echo`
spacewalk-commits@lists.fedorahosted.org