From: František Dvořák <valtri@civ.zcu.cz>
Date: Wed, 29 Feb 2012 17:21:39 +0000 (+0000)
Subject: Install nagios probe in the provided installation script.
X-Git-Tag: gridsite-core_R_1_7_18~6
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=f6617537630db3961ee0c49a5bdfedc197ff5796;p=jra1mw.git

Install nagios probe in the provided installation script.
---

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-autonomous-test.sh b/org.glite.testsuites.ctb/LB/tests/lb-autonomous-test.sh
index 198979d..7f171df 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-autonomous-test.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-autonomous-test.sh
@@ -65,7 +65,8 @@ rpm -i http://emisoft.web.cern.ch/emisoft/dist/EMI/1/sl5/x86_64/base/emi-release
 
 
 
-yum install -y emi-lb --nogpgcheck
+yum install -y --nogpgcheck emi-lb
+yum install -y --nogpgcheck emi-lb-nagios-plugins
 
 cd ~/
 mkdir -m 700 yaim
diff --git a/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh b/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh
index 349868c..f3bf93b 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh
@@ -44,7 +44,7 @@ echo "Output format:    \$OUTPUT_OPT "
 
 export LBTSTCOLS
 
-${INSTALLCMD} globus-proxy-utils postgresql postgresql-server emi-lb-nagios-plugins voms-clients curl wget sudo bc $INSTALLPKGS
+${INSTALLCMD} globus-proxy-utils postgresql postgresql-server voms-clients curl wget sudo bc $INSTALLPKGS
 
 /etc/init.d/postgresql initdb >/dev/null 2>&1
 /etc/init.d/postgresql start