From 7103f63993649643ea8f840e2122ad822d324d9b Mon Sep 17 00:00:00 2001 From: QiLiang Date: Fri, 11 Dec 2015 14:21:27 +0000 Subject: [PATCH] Update Apache configure Scripts update to support apache install in a clean ubuntu 14.04 OS JIRA:BOTTLENECK-24 Change-Id: I7ae84723b6c6f0e36b76cd5165cbf548b40bce32 Signed-off-by: QiLiang --- rubbos/rubbos_scripts/1-1-1/apache_conf/httpd.conf | 4 +- .../1-1-1/apache_conf/workers.properties | 2 +- .../1-1-1/scripts/HTTPD_configure.sh | 2 + .../1-1-1/scripts/HTTPD_pkg_prepare.sh | 45 +++++ .../1-1-1/scripts/HTTPD_rubbos_install.sh | 10 +- rubbos/rubbos_scripts/1-1-1/scripts/run.sh | 196 ++------------------- .../1-1-1/set_bottlenecks_rubbos_env.sh | 20 +-- 7 files changed, 81 insertions(+), 198 deletions(-) create mode 100755 rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_pkg_prepare.sh diff --git a/rubbos/rubbos_scripts/1-1-1/apache_conf/httpd.conf b/rubbos/rubbos_scripts/1-1-1/apache_conf/httpd.conf index fe3be7b9..819bfa63 100644 --- a/rubbos/rubbos_scripts/1-1-1/apache_conf/httpd.conf +++ b/rubbos/rubbos_scripts/1-1-1/apache_conf/httpd.conf @@ -270,8 +270,8 @@ Listen 8000 # when the value of (unsigned)Group is above 60000; # don't use Group #-1 on these systems! # -User nobody -Group #-1 +User apache +Group apache diff --git a/rubbos/rubbos_scripts/1-1-1/apache_conf/workers.properties b/rubbos/rubbos_scripts/1-1-1/apache_conf/workers.properties index df4134bd..d9c77fe0 100644 --- a/rubbos/rubbos_scripts/1-1-1/apache_conf/workers.properties +++ b/rubbos/rubbos_scripts/1-1-1/apache_conf/workers.properties @@ -73,7 +73,7 @@ worker.list=worker1 worker.TOMCAT1.port=8009 -worker.TOMCAT1.host=node8 +worker.TOMCAT1.host=192.168.122.14 worker.TOMCAT1.type=ajp13 worker.TOMCAT1.lbfactor=1 diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_configure.sh b/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_configure.sh index f2b95f46..971948a1 100755 --- a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_configure.sh +++ b/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_configure.sh @@ -9,6 +9,8 @@ cp $OUTPUT_HOME/apache_conf/httpd.conf $HTTPD_HOME/conf/ cp $OUTPUT_HOME/apache_conf/workers.properties $HTTPD_HOME/conf/ cp -r $WORK_HOME/apache_files/rubbos_html $HTTPD_HOME/htdocs/rubbos +apache > /dev/null 2>&1 + echo "APACHE CONFIGURED SUCCESSFULLY on $HOSTNAME" diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_pkg_prepare.sh new file mode 100755 index 00000000..c09860a1 --- /dev/null +++ b/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_pkg_prepare.sh @@ -0,0 +1,45 @@ +#!/bin/bash + +. ../set_bottlenecks_rubbos_env.sh + +scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes" + +# Packages for HTTPD install +if true; then +ssh $HTTPD_HOST "mkdir -p /bottlenecks/rubbos/rubbos_scripts/1-1-1" +scp $scp_options ../set_bottlenecks_rubbos_env.sh $HTTPD_HOST:/bottlenecks/rubbos/rubbos_scripts/1-1-1 + +ssh $HTTPD_HOST "mkdir -p $SOFTWARE_HOME" +scp $scp_options $SOFTWARE_HOME/$HTTPD_TARBALL $HTTPD_HOST:$SOFTWARE_HOME/$HTTPD_TARBALL + +ssh $HTTPD_HOST " + apt-get update + apt-get install -y \ + gcc \ + g++ \ + make +" + +scp $scp_options $SOFTWARE_HOME/$MOD_JK_TARBALL $HTTPD_HOST:$SOFTWARE_HOME/$MOD_JK_TARBALL +scp $scp_options $SOFTWARE_HOME/$JAVA_TARBALL $HTTPD_HOST:$SOFTWARE_HOME/$JAVA_TARBALL + +fi + +# Packages for HTTPD rubbos install +if true; then +scp $scp_options $SOFTWARE_HOME/$RUBBOS_TARBALL $HTTPD_HOST:$SOFTWARE_HOME/$RUBBOS_TARBALL +scp $scp_options $SOFTWARE_HOME/flush_cache $HTTPD_HOST:$SOFTWARE_HOME/flush_cache +scp $scp_options $SOFTWARE_HOME/$SYSSTAT_TARBALL $HTTPD_HOST:$SOFTWARE_HOME/$SYSSTAT_TARBALL +ssh $HTTPD_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf" +scp $scp_options $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $HTTPD_HOST:$OUTPUT_HOME/rubbos_conf/cpu_mem.sh +fi + +# Packages for HTTPD configure +if true; then +ssh $HTTPD_HOST "mkdir -p $OUTPUT_HOME/apache_conf" +scp $scp_options $OUTPUT_HOME/apache_conf/httpd.conf $HTTPD_HOST:$OUTPUT_HOME/apache_conf/httpd.conf +scp $scp_options $OUTPUT_HOME/apache_conf/workers.properties $HTTPD_HOST:$OUTPUT_HOME/apache_conf/workers.properties +ssh $HTTPD_HOST "mkdir -p $WORK_HOME/apache_files" +scp $scp_options -r $WORK_HOME/apache_files/rubbos_html $HTTPD_HOST:$WORK_HOME/apache_files/rubbos_html +fi + diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_install.sh index 74030691..48dc2310 100755 --- a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_install.sh +++ b/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_install.sh @@ -12,11 +12,11 @@ tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP cp $SOFTWARE_HOME/flush_cache $RUBBOS_HOME/bench/. # install sysstat -tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP -cd $SYSSTAT_HOME -./configure --prefix=$SYSSTAT_HOME -make -sudo make install +#tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP +#cd $SYSSTAT_HOME +#./configure --prefix=$SYSSTAT_HOME +#make +#sudo make install # install a script to collect statistics data cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/. diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/run.sh b/rubbos/rubbos_scripts/1-1-1/scripts/run.sh index 698eb415..b30276fa 100755 --- a/rubbos/rubbos_scripts/1-1-1/scripts/run.sh +++ b/rubbos/rubbos_scripts/1-1-1/scripts/run.sh @@ -6,193 +6,29 @@ echo "*** scp scripts *************************************************" scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes" -scp $scp_options CONTROL_checkScp_exec.sh $CONTROL_HOST:/tmp - -scp $scp_options CONTROL_emulabConf_exec.sh $CONTROL_HOST:/tmp - -scp $scp_options CONTROL_rubbos_exec.sh $CONTROL_HOST:/tmp - -scp $scp_options BENCHMARK_rubbos_install.sh $BENCHMARK_HOST:/tmp - -scp $scp_options BENCHMARK_install.sh $BENCHMARK_HOST:/tmp - -scp $scp_options BENCHMARK_configure.sh $BENCHMARK_HOST:/tmp - -scp $scp_options BENCHMARK_uninstall.sh $BENCHMARK_HOST:/tmp - -scp $scp_options BENCHMARK_rubbos_uninstall.sh $BENCHMARK_HOST:/tmp - -scp $scp_options CLIENT1_rubbos_install.sh $CLIENT1_HOST:/tmp - -scp $scp_options CLIENT1_install.sh $CLIENT1_HOST:/tmp - -scp $scp_options CLIENT1_configure.sh $CLIENT1_HOST:/tmp - -scp $scp_options CLIENT1_uninstall.sh $CLIENT1_HOST:/tmp - -scp $scp_options CLIENT1_rubbos_uninstall.sh $CLIENT1_HOST:/tmp - -scp $scp_options CLIENT2_rubbos_install.sh $CLIENT2_HOST:/tmp - -scp $scp_options CLIENT2_install.sh $CLIENT2_HOST:/tmp - -scp $scp_options CLIENT2_configure.sh $CLIENT2_HOST:/tmp - -scp $scp_options CLIENT2_uninstall.sh $CLIENT2_HOST:/tmp - -scp $scp_options CLIENT2_rubbos_uninstall.sh $CLIENT2_HOST:/tmp - -scp $scp_options CLIENT3_rubbos_install.sh $CLIENT3_HOST:/tmp - -scp $scp_options CLIENT3_install.sh $CLIENT3_HOST:/tmp - -scp $scp_options CLIENT3_configure.sh $CLIENT3_HOST:/tmp - -scp $scp_options CLIENT3_uninstall.sh $CLIENT3_HOST:/tmp - -scp $scp_options CLIENT3_rubbos_uninstall.sh $CLIENT3_HOST:/tmp - -scp $scp_options CLIENT4_rubbos_install.sh $CLIENT4_HOST:/tmp - -scp $scp_options CLIENT4_install.sh $CLIENT4_HOST:/tmp - -scp $scp_options CLIENT4_configure.sh $CLIENT4_HOST:/tmp - -scp $scp_options CLIENT4_uninstall.sh $CLIENT4_HOST:/tmp - -scp $scp_options CLIENT4_rubbos_uninstall.sh $CLIENT4_HOST:/tmp - -scp $scp_options HTTPD_install.sh $HTTPD_HOST:/tmp - -scp $scp_options HTTPD_rubbos_install.sh $HTTPD_HOST:/tmp - -scp $scp_options HTTPD_configure.sh $HTTPD_HOST:/tmp - -scp $scp_options HTTPD_ignition.sh $HTTPD_HOST:/tmp - -scp $scp_options HTTPD_stop.sh $HTTPD_HOST:/tmp - -scp $scp_options HTTPD_rubbos_uninstall.sh $HTTPD_HOST:/tmp - -scp $scp_options HTTPD_uninstall.sh $HTTPD_HOST:/tmp - -scp $scp_options TOMCAT1_install.sh $TOMCAT1_HOST:/tmp - -scp $scp_options TOMCAT1_rubbos_install.sh $TOMCAT1_HOST:/tmp - -scp $scp_options TOMCAT1_configure.sh $TOMCAT1_HOST:/tmp - -scp $scp_options TOMCAT1_rubbosSL_configure.sh $TOMCAT1_HOST:/tmp - -scp $scp_options TOMCAT1_ignition.sh $TOMCAT1_HOST:/tmp - -scp $scp_options TOMCAT1_stop.sh $TOMCAT1_HOST:/tmp - -scp $scp_options TOMCAT1_rubbos_uninstall.sh $TOMCAT1_HOST:/tmp - -scp $scp_options TOMCAT1_uninstall.sh $TOMCAT1_HOST:/tmp - -scp $scp_options MYSQL1_install.sh $MYSQL1_HOST:/tmp - -scp $scp_options MYSQL1_rubbos_install.sh $MYSQL1_HOST:/tmp - -scp $scp_options MYSQL1_configure.sh $MYSQL1_HOST:/tmp - -scp $scp_options MYSQL1_reset.sh $MYSQL1_HOST:/tmp - -scp $scp_options MYSQL1_ignition.sh $MYSQL1_HOST:/tmp - -scp $scp_options MYSQL1_stop.sh $MYSQL1_HOST:/tmp - -scp $scp_options MYSQL1_rubbos_uninstall.sh $MYSQL1_HOST:/tmp - -scp $scp_options MYSQL1_uninstall.sh $MYSQL1_HOST:/tmp - +if true; then +for script in HTTPD_install.sh HTTPD_rubbos_install.sh \ + HTTPD_configure.sh HTTPD_ignition.sh \ + HTTPD_stop.sh HTTPD_rubbos_uninstall.sh \ + HTTPD_uninstall.sh +do + scp $scp_options $script $HTTPD_HOST:/tmp +done + +fi +# Prepare software packages +echo "*** prepare software packages ***" +./HTTPD_pkg_prepare.sh # Install and Configure and run Apache, Tomcat, CJDBC, and MySQL echo "*** install scripts & configure & execute ***********************" -#ssh root@$CONTROL_HOST chmod 777 /tmp/CONTROL_checkScp_exe.sh -#ssh $CONTROL_HOST /tmp/CONTROL_checkScp_exec.sh -#ssh root@$CONTROL_HOST chmod 777 /tmp/CONTROL_emulabConf_exec.sh -#ssh $CONTROL_HOST /tmp/CONTROL_emulabConf_exec.sh - -ssh root@$MYSQL1_HOST chmod 770 /tmp/MYSQL1_install.sh -ssh $MYSQL1_HOST /tmp/MYSQL1_install.sh - -ssh root@$TOMCAT1_HOST chmod 770 /tmp/TOMCAT1_install.sh -ssh $TOMCAT1_HOST /tmp/TOMCAT1_install.sh - ssh root@$HTTPD_HOST chmod 770 /tmp/HTTPD_install.sh -ssh $HTTPD_HOST /tmp/HTTPD_install.sh - -ssh root@$MYSQL1_HOST chmod 770 /tmp/MYSQL1_rubbos_install.sh -ssh $MYSQL1_HOST /tmp/MYSQL1_rubbos_install.sh - -ssh root@$TOMCAT1_HOST chmod 770 /tmp/TOMCAT1_rubbos_install.sh -ssh $TOMCAT1_HOST /tmp/TOMCAT1_rubbos_install.sh +ssh $HTTPD_HOST /tmp/HTTPD_install.sh ssh root@$HTTPD_HOST chmod 770 /tmp/HTTPD_rubbos_install.sh -ssh $HTTPD_HOST /tmp/HTTPD_rubbos_install.sh - -ssh root@$BENCHMARK_HOST chmod 770 /tmp/BENCHMARK_rubbos_install.sh -ssh $BENCHMARK_HOST /tmp/BENCHMARK_rubbos_install.sh - -ssh root@$CLIENT1_HOST chmod 770 /tmp/CLIENT1_rubbos_install.sh -ssh $CLIENT1_HOST /tmp/CLIENT1_rubbos_install.sh - -ssh root@$CLIENT2_HOST chmod 770 /tmp/CLIENT2_rubbos_install.sh -ssh $CLIENT2_HOST /tmp/CLIENT2_rubbos_install.sh - -ssh root@$CLIENT3_HOST chmod 770 /tmp/CLIENT3_rubbos_install.sh -ssh $CLIENT3_HOST /tmp/CLIENT3_rubbos_install.sh - -ssh root@$CLIENT4_HOST chmod 770 /tmp/CLIENT4_rubbos_install.sh -ssh $CLIENT4_HOST /tmp/CLIENT4_rubbos_install.sh - -ssh root@$BENCHMARK_HOST chmod 770 /tmp/BENCHMARK_install.sh -ssh $BENCHMARK_HOST /tmp/BENCHMARK_install.sh - -ssh root@$CLIENT1_HOST chmod 770 /tmp/CLIENT1_install.sh -ssh $CLIENT1_HOST /tmp/CLIENT1_install.sh - -#ssh root@$CLIENT2_HOST chmod 777 /tmp/CLIENT2_install.sh -#ssh $CLIENT2_HOST /tmp/CLIENT2_install.sh - -#ssh root@$CLIENT3_HOST chmod 777 /tmp/CLIENT3_install.sh -#ssh $CLIENT3_HOST /tmp/CLIENT3_install.sh - -#ssh root@$CLIENT4_HOST chmod 777 /tmp/CLIENT4_install.sh -#ssh $CLIENT4_HOST /tmp/CLIENT4_install.sh - -ssh root@$MYSQL1_HOST chmod 770 /tmp/MYSQL1_configure.sh -ssh $MYSQL1_HOST /tmp/MYSQL1_configure.sh & -sleep 60 - -ssh root@$TOMCAT1_HOST chmod 770 /tmp/TOMCAT1_configure.sh -ssh $TOMCAT1_HOST /tmp/TOMCAT1_configure.sh +ssh $HTTPD_HOST /tmp/HTTPD_rubbos_install.sh ssh root@$HTTPD_HOST chmod 770 /tmp/HTTPD_configure.sh -ssh $HTTPD_HOST /tmp/HTTPD_configure.sh - -ssh root@$BENCHMARK_HOST chmod 770 /tmp/BENCHMARK_configure.sh -ssh $BENCHMARK_HOST /tmp/BENCHMARK_configure.sh - -ssh root@$CLIENT1_HOST chmod 770 /tmp/CLIENT1_configure.sh -ssh $CLIENT1_HOST /tmp/CLIENT1_configure.sh - -#ssh root@$CLIENT2_HOST chmod 777 /tmp/CLIENT2_configure.sh -#ssh $CLIENT2_HOST /tmp/CLIENT2_configure.sh - -#ssh root@$CLIENT3_HOST chmod 777 /tmp/CLIENT3_configure.sh -#ssh $CLIENT3_HOST /tmp/CLIENT3_configure.sh - -#ssh root@$CLIENT4_HOST chmod 777 /tmp/CLIENT4_configure.sh -#ssh $CLIENT4_HOST /tmp/CLIENT4_configure.sh - -ssh root@$TOMCAT1_HOST chmod 770 /tmp/TOMCAT1_rubbosSL_configure.sh -ssh $TOMCAT1_HOST /tmp/TOMCAT1_rubbosSL_configure.sh - - -#ssh $CONTROL_HOST /tmp/CONTROL_rubbos_exec.sh +ssh $HTTPD_HOST /tmp/HTTPD_configure.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 b1cef518..9d25f67b 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 @@ -3,15 +3,15 @@ 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 @@ -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.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 -- 2.16.6