Fix missing yaimlog level argument, don't add glite/lib and globus/lib

to LD_LIBRARY_PATH as config_globus_clients and YAIM core already do that.

diff --git a/org.glite.yaim.lb/config/functions/config_glite_lb b/org.glite.yaim.lb/config/functions/config_glite_lb
index 64b7940..8019531 100644 (file)
--- a/org.glite.yaim.lb/config/functions/config_glite_lb
+++ b/org.glite.yaim.lb/config/functions/config_glite_lb
@@ -15,8 +15,6 @@ function config_glite_lb_setenv(){
   yaimgridenv_set GLITE_LB_EXPORT_PURGE_ARGS "${GLITE_LB_EXPORT_PURGE_ARGS:---cleared 2d --aborted 15d --cancelled 15d --other 60d}"
   yaimgridenv_set GLITE_LB_EXPORT_JPPS ${GLITE_LB_EXPORT_JPPS:-}
 
-  yaimgridpath_append LD_LIBRARY_PATH ${INSTALL_ROOT:-opt}/glite/lib
-  yaimgridpath_append LD_LIBRARY_PATH ${INSTALL_ROOT:-opt}/globus/lib
   yaimgridpath_append LD_LIBRARY_PATH ${INSTALL_ROOT:-opt}/c-ares/lib
   yaimgridpath_append LD_LIBRARY_PATH ${INSTALL_ROOT:-opt}/classads/lib
 }
@@ -89,7 +87,7 @@ function config_glite_lb() {
     mysql -u root --password="$MYSQL_PASSWORD" -e "ALTER TABLE states MAX_ROWS=9500000;" lbserver20
     mysql -u root --password="$MYSQL_PASSWORD" -e "ALTER TABLE events MAX_ROWS=175000000;" lbserver20
   else
-    yaimlog "Database lbserver20 already exists"
+    yaimlog WARNING "Database lbserver20 already exists"
   fi
 
   # do we need bkindex?

diff --git a/org.glite.yaim.lb/config/functions/config_glite_lb_30 b/org.glite.yaim.lb/config/functions/config_glite_lb_30
index 15df00e..9ac8cb6 100644 (file)
--- a/org.glite.yaim.lb/config/functions/config_glite_lb_30
+++ b/org.glite.yaim.lb/config/functions/config_glite_lb_30
@@ -69,7 +69,7 @@ function config_glite_lb_30() {
     mysql -u root --password="$MYSQL_PASSWORD" -e "ALTER TABLE states MAX_ROWS=9500000;" lbserver20
     mysql -u root --password="$MYSQL_PASSWORD" -e "ALTER TABLE events MAX_ROWS=175000000;" lbserver20
   else
-    yaimlog "Database lbserver20 already exists"
+    yaimlog WARNING "Database lbserver20 already exists"
   fi
 
   # do we need bkindex?