X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=rubbos%2Frubbos_scripts%2F1-1-1%2Fset_bottlenecks_rubbos_env.sh;h=6ec0dab01fb3fb09a4b97b2831e1bb6fc078851d;hb=26e1b1c7acbbadf08152e94ff9910ccd6b200ec5;hp=0b04f99496c4f19b14632ad3530113f61b2295f4;hpb=9d057da4858e2c67c48a108bbccf0bf040b34cac;p=bottlenecks.git

diff --git a/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh b/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh
index 0b04f994..6ec0dab0 100755
--- a/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh
+++ b/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh
@@ -1,26 +1,17 @@
-
 #!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei
-# hongbo.tianhongbo@huawei.com
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
 
 set -o allexport
 
 # HOSTS
-CONTROL_HOST=192.168.50.60
-BENCHMARK_HOST=192.168.50.60
-CLIENT1_HOST=192.168.50.60
-CLIENT2_HOST=192.168.50.60
-CLIENT3_HOST=192.168.50.60
-CLIENT4_HOST=192.168.50.60
-HTTPD_HOST=192.168.50.58
-TOMCAT1_HOST=192.168.50.18
-MYSQL1_HOST=192.168.50.19
+CONTROL_HOST=192.168.122.11
+BENCHMARK_HOST=192.168.122.11
+CLIENT1_HOST=192.168.122.11
+CLIENT2_HOST=192.168.122.11
+CLIENT3_HOST=192.168.122.11
+CLIENT4_HOST=192.168.122.11
+HTTPD_HOST=192.168.122.12
+TOMCAT1_HOST=192.168.122.14
+MYSQL1_HOST=192.168.122.13
 
 # Experiment name on OPNFV
 BOTTLNECKS_NAME=bottlenecks
@@ -31,13 +22,13 @@ OUTPUT_HOME=/bottlenecks/rubbos/rubbos_scripts/1-1-1
 SOFTWARE_HOME=/bottlenecks/rubbos/app_tools
 
 # Output directory for results of RUBBoS benchmark
-RUBBOS_RESULTS_HOST=192.168.50.58
+RUBBOS_RESULTS_HOST=192.168.122.11
 RUBBOS_RESULTS_DIR_BASE=/bottlenecks/rubbos/rubbos_results
 RUBBOS_RESULTS_DIR_NAME=2015-01-20T081237-0700
 
 # Target directories
-BOTTLNECKS_TOP=/bottlenecks
-RUBBOS_TOP=$BOTTLNECKS_TOP/rubbos
+BOTTLENECKS_TOP=/bottlenecks
+RUBBOS_TOP=$BOTTLENECKS_TOP/rubbos
 RUBBOS_APP=$RUBBOS_TOP/app
 TMP_RESULTS_DIR_BASE=$RUBBOS_TOP/tmp_results
 RUBBOS_HOME=$RUBBOS_APP/RUBBoS
@@ -52,7 +43,7 @@ SERVLET_API_PATH=$CATALINA_HOME/common/lib/servlet-api.jar
 CATALINA_BASE=$CATALINA_HOME
 CJDBC_HOME=
 
-MYSQL_HOME=$RUBBOS_APP/mysql-5.0.51a-linux-i686-glibc23
+MYSQL_HOME=$RUBBOS_APP/mysql-5.5.46-linux2.6-x86_64
 
 # Java & Ant
 JAVA_HOME=$RUBBOS_APP/jdk1.6.0_27
@@ -69,9 +60,10 @@ HTTPD_TARBALL=httpd-2.0.64.tar.gz
 MOD_JK_TARBALL=tomcat-connectors-1.2.32-src.tar.gz
 TOMCAT_TARBALL=apache-tomcat-5.5.17.tar.gz
 CJDBC_TARBALL=
-MYSQL_TARBALL=mysql-5.0.51a-linux-i686-glibc23.tar.gz
+MYSQL_TARBALL=mysql-5.5.46-linux2.6-x86_64.tar.gz
 RUBBOS_TARBALL=RUBBoS-servlets.tar.gz
-RUBBOS_DATA_TARBALL=rubbos_data.tar.gz
+RUBBOS_DATA_TARBALL=rubbos_data.sql.tar.gz
+RUBBOS_DATA_SQL=rubbos_data.sql
 RUBBOS_DATA_TEXTFILES_TARBALL=smallDB-rubbos-modified.tgz
 
 # for MySQL
@@ -82,10 +74,14 @@ MYSQL_DATA_DIR=$MYSQL_HOME/data
 MYSQL_ERR_LOG=$MYSQL_HOME/data/mysql.log
 MYSQL_PID_FILE=$MYSQL_HOME/run/mysqld.pid
 
+# for DBs & C-JDBC
+ROOT_PASSWORD=new-password
+BOTTLENECKS_USER=bottlenecks
+BOTTLENECKS_PASSWORD=bottlenecks
+
 
 CLASSPATH=$CLASSPATH:$JONAS_ROOT/bin/unix/registry:$JAVA_HOME:$JAVA_HOME/lib/tools.jar:$SERVLET_API_PATH:.
 
 PATH=$JAVA_HOME/bin:$JONAS_ROOT/bin/unix:$ANT_HOME/bin:$CATALINA_HOME/bin:$PATH
-
 set +o allexport