fix bugs of installing mysql

[bottlenecks.git] / rubbos / rubbos_scripts / 1-1-1 / set_bottlenecks_rubbos_env.sh

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 9d25f67..3008c4c 100755 (executable)
--- a/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh
+++ b/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh
@@ -4,14 +4,14 @@ set -o allexport
 
 # HOSTS
 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
+BHTTPD_HOST=192.168.122.12
 MYSQL1_HOST=192.168.122.13
+TOMCAT1_HOST=192.168.122.14
+CLIENT1_HOST=192.168.122.15
+CLIENT2_HOST=192.168.122.16
+CLIENT3_HOST=192.168.122.17
+CLIENT4_HOST=192.168.122.18
+ENCHMARK_HOST=192.168.122.19
 
 # Experiment name on OPNFV
 BOTTLNECKS_NAME=bottlenecks
@@ -22,7 +22,7 @@ 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.122.11
+RUBBOS_RESULTS_HOST=${CONTROL_HOST}
 RUBBOS_RESULTS_DIR_BASE=/bottlenecks/rubbos/rubbos_results
 RUBBOS_RESULTS_DIR_NAME=2015-01-20T081237-0700
 
@@ -62,7 +62,8 @@ TOMCAT_TARBALL=apache-tomcat-5.5.17.tar.gz
 CJDBC_TARBALL=
 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
@@ -75,8 +76,8 @@ MYSQL_PID_FILE=$MYSQL_HOME/run/mysqld.pid
 
 # for DBs & C-JDBC
 ROOT_PASSWORD=new-password
-BOTTLENECKS_USER=bottlenecks
-BOTTLENECKS_PASSWORD=bottlenecks
+BOTTLENECKS_USER=mysql
+BOTTLENECKS_PASSWORD=mysql
 
 
 CLASSPATH=$CLASSPATH:$JONAS_ROOT/bin/unix/registry:$JAVA_HOME:$JAVA_HOME/lib/tools.jar:$SERVLET_API_PATH:.