summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthewLi <matthew.lijun@huawei.com>2015-12-07 03:09:56 -0800
committerMatthewLi <matthew.lijun@huawei.com>2015-12-07 18:03:45 -0800
commit82a002de9648c5e43e13863310f7c279545bd8c9 (patch)
tree3f10d9a3854015f98162e7980b06cf0cbec082c4
parent37470ab743d5dfc279342cb1933d7630a6fa0397 (diff)
rubbos run/exec scripts improvement
JIRA: BOTTLENECK-31 to improve the scripts Change-Id: I9e65d92b47f37ab6b303e0414027a126d455aa12 Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/bakrun.sh.bak194
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/check_service_status.sh11
-rwxr-xr-x[-rw-r--r--]rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh0
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/run.sh146
4 files changed, 85 insertions, 266 deletions
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/bakrun.sh.bak b/rubbos/rubbos_scripts/1-1-1/scripts/bakrun.sh.bak
deleted file mode 100755
index c7be8c73..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/bakrun.sh.bak
+++ /dev/null
@@ -1,194 +0,0 @@
-
-cd /root/rui/rubbos/rubbosMulini6/1-1-1
-source set_elba_env.sh
-cd /root/rui/rubbos/rubbosMulini6/1-1-1/scripts
-# Transfer all sub scripts to target hosts
-echo "*** scp scripts *************************************************"
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CONTROL_checkScp_exec.sh $CONTROL_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CONTROL_emulabConf_exec.sh $CONTROL_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CONTROL_rubbos_exec.sh $CONTROL_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK_rubbos_install.sh $BENCHMARK_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK_install.sh $BENCHMARK_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK_configure.sh $BENCHMARK_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK_uninstall.sh $BENCHMARK_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK_rubbos_uninstall.sh $BENCHMARK_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1_rubbos_install.sh $CLIENT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1_install.sh $CLIENT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1_configure.sh $CLIENT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1_uninstall.sh $CLIENT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1_rubbos_uninstall.sh $CLIENT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2_rubbos_install.sh $CLIENT2_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2_install.sh $CLIENT2_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2_configure.sh $CLIENT2_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2_uninstall.sh $CLIENT2_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2_rubbos_uninstall.sh $CLIENT2_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3_rubbos_install.sh $CLIENT3_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3_install.sh $CLIENT3_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3_configure.sh $CLIENT3_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3_uninstall.sh $CLIENT3_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3_rubbos_uninstall.sh $CLIENT3_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4_rubbos_install.sh $CLIENT4_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4_install.sh $CLIENT4_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4_configure.sh $CLIENT4_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4_uninstall.sh $CLIENT4_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4_rubbos_uninstall.sh $CLIENT4_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_install.sh $HTTPD_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_rubbos_install.sh $HTTPD_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_configure.sh $HTTPD_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_ignition.sh $HTTPD_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_stop.sh $HTTPD_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_rubbos_uninstall.sh $HTTPD_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_uninstall.sh $HTTPD_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_install.sh $TOMCAT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_rubbos_install.sh $TOMCAT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_configure.sh $TOMCAT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_rubbosSL_configure.sh $TOMCAT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_ignition.sh $TOMCAT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_stop.sh $TOMCAT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_rubbos_uninstall.sh $TOMCAT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_uninstall.sh $TOMCAT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_install.sh $MYSQL1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_rubbos_install.sh $MYSQL1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_configure.sh $MYSQL1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_reset.sh $MYSQL1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_ignition.sh $MYSQL1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_stop.sh $MYSQL1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_rubbos_uninstall.sh $MYSQL1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_uninstall.sh $MYSQL1_HOST:/tmp
-
-
-# Install and Configure and run Apache, Tomcat, CJDBC, and MySQL
-echo "*** install scripts & configure & execute ***********************"
-
-ssh $CONTROL_HOST /tmp/CONTROL_checkScp_exec.sh
-ssh $CONTROL_HOST /tmp/CONTROL_emulabConf_exec.sh
-
-
-ssh $MYSQL1_HOST /tmp/MYSQL1_install.sh
-
-
-ssh $TOMCAT1_HOST /tmp/TOMCAT1_install.sh
-
-
-ssh $HTTPD_HOST /tmp/HTTPD_install.sh
-
-
-ssh $MYSQL1_HOST /tmp/MYSQL1_rubbos_install.sh
-
-
-ssh $TOMCAT1_HOST /tmp/TOMCAT1_rubbos_install.sh
-
-
-ssh $HTTPD_HOST /tmp/HTTPD_rubbos_install.sh
-
-
-ssh $BENCHMARK_HOST /tmp/BENCHMARK_rubbos_install.sh
-
-
-ssh $CLIENT1_HOST /tmp/CLIENT1_rubbos_install.sh
-
-
-ssh $CLIENT2_HOST /tmp/CLIENT2_rubbos_install.sh
-
-
-ssh $CLIENT3_HOST /tmp/CLIENT3_rubbos_install.sh
-
-
-ssh $CLIENT4_HOST /tmp/CLIENT4_rubbos_install.sh
-
-
-ssh $BENCHMARK_HOST /tmp/BENCHMARK_install.sh
-
-
-ssh $CLIENT1_HOST /tmp/CLIENT1_install.sh
-
-
-ssh $CLIENT2_HOST /tmp/CLIENT2_install.sh
-
-
-ssh $CLIENT3_HOST /tmp/CLIENT3_install.sh
-
-
-ssh $CLIENT4_HOST /tmp/CLIENT4_install.sh
-
-
-ssh $MYSQL1_HOST /tmp/MYSQL1_configure.sh &
-sleep 60
-
-ssh $TOMCAT1_HOST /tmp/TOMCAT1_configure.sh
-
-
-ssh $HTTPD_HOST /tmp/HTTPD_configure.sh
-
-
-ssh $BENCHMARK_HOST /tmp/BENCHMARK_configure.sh
-
-
-ssh $CLIENT1_HOST /tmp/CLIENT1_configure.sh
-
-
-ssh $CLIENT2_HOST /tmp/CLIENT2_configure.sh
-
-
-ssh $CLIENT3_HOST /tmp/CLIENT3_configure.sh
-
-
-ssh $CLIENT4_HOST /tmp/CLIENT4_configure.sh
-
-
-ssh $TOMCAT1_HOST /tmp/TOMCAT1_rubbosSL_configure.sh
-
-
-#ssh $CONTROL_HOST /tmp/CONTROL_rubbos_exec.sh
-
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/check_service_status.sh b/rubbos/rubbos_scripts/1-1-1/scripts/check_service_status.sh
new file mode 100755
index 00000000..e2ea68e7
--- /dev/null
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/check_service_status.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
+source set_bottlenecks_rubbos_env.sh
+
+#ssh_options=""
+
+ssh root@$TOMCAT1_HOST service tomcat status
+ssh root@$HTTPD_HOST service apache2 status
+ssh root@$MYSQL1_HOST service mysql status
+
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh b/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh
index e49bc6ba..e49bc6ba 100644..100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/run.sh b/rubbos/rubbos_scripts/1-1-1/scripts/run.sh
index 559d159b..698eb415 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/run.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/run.sh
@@ -4,107 +4,109 @@ cd /bottlenecks/rubbos/rubbos_scripts/1-1-1/scripts
# Transfer all sub scripts to target hosts
echo "*** scp scripts *************************************************"
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CONTROL_checkScp_exec.sh $CONTROL_HOST:/tmp
+scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CONTROL_emulabConf_exec.sh $CONTROL_HOST:/tmp
+scp $scp_options CONTROL_checkScp_exec.sh $CONTROL_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CONTROL_rubbos_exec.sh $CONTROL_HOST:/tmp
+scp $scp_options CONTROL_emulabConf_exec.sh $CONTROL_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK_rubbos_install.sh $BENCHMARK_HOST:/tmp
+scp $scp_options CONTROL_rubbos_exec.sh $CONTROL_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK_install.sh $BENCHMARK_HOST:/tmp
+scp $scp_options BENCHMARK_rubbos_install.sh $BENCHMARK_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK_configure.sh $BENCHMARK_HOST:/tmp
+scp $scp_options BENCHMARK_install.sh $BENCHMARK_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK_uninstall.sh $BENCHMARK_HOST:/tmp
+scp $scp_options BENCHMARK_configure.sh $BENCHMARK_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK_rubbos_uninstall.sh $BENCHMARK_HOST:/tmp
+scp $scp_options BENCHMARK_uninstall.sh $BENCHMARK_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1_rubbos_install.sh $CLIENT1_HOST:/tmp
+scp $scp_options BENCHMARK_rubbos_uninstall.sh $BENCHMARK_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1_install.sh $CLIENT1_HOST:/tmp
+scp $scp_options CLIENT1_rubbos_install.sh $CLIENT1_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1_configure.sh $CLIENT1_HOST:/tmp
+scp $scp_options CLIENT1_install.sh $CLIENT1_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1_uninstall.sh $CLIENT1_HOST:/tmp
+scp $scp_options CLIENT1_configure.sh $CLIENT1_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1_rubbos_uninstall.sh $CLIENT1_HOST:/tmp
+scp $scp_options CLIENT1_uninstall.sh $CLIENT1_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2_rubbos_install.sh $CLIENT2_HOST:/tmp
+scp $scp_options CLIENT1_rubbos_uninstall.sh $CLIENT1_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2_install.sh $CLIENT2_HOST:/tmp
+scp $scp_options CLIENT2_rubbos_install.sh $CLIENT2_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2_configure.sh $CLIENT2_HOST:/tmp
+scp $scp_options CLIENT2_install.sh $CLIENT2_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2_uninstall.sh $CLIENT2_HOST:/tmp
+scp $scp_options CLIENT2_configure.sh $CLIENT2_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2_rubbos_uninstall.sh $CLIENT2_HOST:/tmp
+scp $scp_options CLIENT2_uninstall.sh $CLIENT2_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3_rubbos_install.sh $CLIENT3_HOST:/tmp
+scp $scp_options CLIENT2_rubbos_uninstall.sh $CLIENT2_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3_install.sh $CLIENT3_HOST:/tmp
+scp $scp_options CLIENT3_rubbos_install.sh $CLIENT3_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3_configure.sh $CLIENT3_HOST:/tmp
+scp $scp_options CLIENT3_install.sh $CLIENT3_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3_uninstall.sh $CLIENT3_HOST:/tmp
+scp $scp_options CLIENT3_configure.sh $CLIENT3_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3_rubbos_uninstall.sh $CLIENT3_HOST:/tmp
+scp $scp_options CLIENT3_uninstall.sh $CLIENT3_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4_rubbos_install.sh $CLIENT4_HOST:/tmp
+scp $scp_options CLIENT3_rubbos_uninstall.sh $CLIENT3_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4_install.sh $CLIENT4_HOST:/tmp
+scp $scp_options CLIENT4_rubbos_install.sh $CLIENT4_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4_configure.sh $CLIENT4_HOST:/tmp
+scp $scp_options CLIENT4_install.sh $CLIENT4_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4_uninstall.sh $CLIENT4_HOST:/tmp
+scp $scp_options CLIENT4_configure.sh $CLIENT4_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4_rubbos_uninstall.sh $CLIENT4_HOST:/tmp
+scp $scp_options CLIENT4_uninstall.sh $CLIENT4_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_install.sh $HTTPD_HOST:/tmp
+scp $scp_options CLIENT4_rubbos_uninstall.sh $CLIENT4_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_rubbos_install.sh $HTTPD_HOST:/tmp
+scp $scp_options HTTPD_install.sh $HTTPD_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_configure.sh $HTTPD_HOST:/tmp
+scp $scp_options HTTPD_rubbos_install.sh $HTTPD_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_ignition.sh $HTTPD_HOST:/tmp
+scp $scp_options HTTPD_configure.sh $HTTPD_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_stop.sh $HTTPD_HOST:/tmp
+scp $scp_options HTTPD_ignition.sh $HTTPD_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_rubbos_uninstall.sh $HTTPD_HOST:/tmp
+scp $scp_options HTTPD_stop.sh $HTTPD_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_uninstall.sh $HTTPD_HOST:/tmp
+scp $scp_options HTTPD_rubbos_uninstall.sh $HTTPD_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_install.sh $TOMCAT1_HOST:/tmp
+scp $scp_options HTTPD_uninstall.sh $HTTPD_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_rubbos_install.sh $TOMCAT1_HOST:/tmp
+scp $scp_options TOMCAT1_install.sh $TOMCAT1_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_configure.sh $TOMCAT1_HOST:/tmp
+scp $scp_options TOMCAT1_rubbos_install.sh $TOMCAT1_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_rubbosSL_configure.sh $TOMCAT1_HOST:/tmp
+scp $scp_options TOMCAT1_configure.sh $TOMCAT1_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_ignition.sh $TOMCAT1_HOST:/tmp
+scp $scp_options TOMCAT1_rubbosSL_configure.sh $TOMCAT1_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_stop.sh $TOMCAT1_HOST:/tmp
+scp $scp_options TOMCAT1_ignition.sh $TOMCAT1_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_rubbos_uninstall.sh $TOMCAT1_HOST:/tmp
+scp $scp_options TOMCAT1_stop.sh $TOMCAT1_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_uninstall.sh $TOMCAT1_HOST:/tmp
+scp $scp_options TOMCAT1_rubbos_uninstall.sh $TOMCAT1_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_install.sh $MYSQL1_HOST:/tmp
+scp $scp_options TOMCAT1_uninstall.sh $TOMCAT1_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_rubbos_install.sh $MYSQL1_HOST:/tmp
+scp $scp_options MYSQL1_install.sh $MYSQL1_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_configure.sh $MYSQL1_HOST:/tmp
+scp $scp_options MYSQL1_rubbos_install.sh $MYSQL1_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_reset.sh $MYSQL1_HOST:/tmp
+scp $scp_options MYSQL1_configure.sh $MYSQL1_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_ignition.sh $MYSQL1_HOST:/tmp
+scp $scp_options MYSQL1_reset.sh $MYSQL1_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_stop.sh $MYSQL1_HOST:/tmp
+scp $scp_options MYSQL1_ignition.sh $MYSQL1_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_rubbos_uninstall.sh $MYSQL1_HOST:/tmp
+scp $scp_options MYSQL1_stop.sh $MYSQL1_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_uninstall.sh $MYSQL1_HOST:/tmp
+scp $scp_options MYSQL1_rubbos_uninstall.sh $MYSQL1_HOST:/tmp
+
+scp $scp_options MYSQL1_uninstall.sh $MYSQL1_HOST:/tmp
# Install and Configure and run Apache, Tomcat, CJDBC, and MySQL
@@ -115,43 +117,43 @@ echo "*** install scripts & configure & execute ***********************"
#ssh root@$CONTROL_HOST chmod 777 /tmp/CONTROL_emulabConf_exec.sh
#ssh $CONTROL_HOST /tmp/CONTROL_emulabConf_exec.sh
-ssh root@$MYSQL1_HOST chmod 777 /tmp/MYSQL1_install.sh
+ssh root@$MYSQL1_HOST chmod 770 /tmp/MYSQL1_install.sh
ssh $MYSQL1_HOST /tmp/MYSQL1_install.sh
-ssh root@$TOMCAT1_HOST chmod 777 /tmp/TOMCAT1_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 777 /tmp/MYSQL1_rubbos_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 777 /tmp/TOMCAT1_rubbos_install.sh
+ssh root@$TOMCAT1_HOST chmod 770 /tmp/TOMCAT1_rubbos_install.sh
ssh $TOMCAT1_HOST /tmp/TOMCAT1_rubbos_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 777 /tmp/BENCHMARK_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 777 /tmp/CLIENT1_rubbos_install.sh
-ssh $CLIENT1_HOST /tmp/CLIENT1_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 777 /tmp/CLIENT2_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 777 /tmp/CLIENT3_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 777 /tmp/CLIENT4_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 777 /tmp/BENCHMARK_install.sh
+ssh root@$BENCHMARK_HOST chmod 770 /tmp/BENCHMARK_install.sh
ssh $BENCHMARK_HOST /tmp/BENCHMARK_install.sh
-ssh root@$CLIENT1_HOST chmod 777 /tmp/CLIENT1_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
@@ -163,20 +165,20 @@ ssh $CLIENT1_HOST /tmp/CLIENT1_install.sh
#ssh root@$CLIENT4_HOST chmod 777 /tmp/CLIENT4_install.sh
#ssh $CLIENT4_HOST /tmp/CLIENT4_install.sh
-ssh root@$MYSQL1_HOST chmod 777 /tmp/MYSQL1_configure.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 777 /tmp/TOMCAT1_configure.sh
+ssh root@$TOMCAT1_HOST chmod 770 /tmp/TOMCAT1_configure.sh
ssh $TOMCAT1_HOST /tmp/TOMCAT1_configure.sh
-
+ssh root@$HTTPD_HOST chmod 770 /tmp/HTTPD_configure.sh
ssh $HTTPD_HOST /tmp/HTTPD_configure.sh
-ssh root@$BENCHMARK_HOST chmod 777 /tmp/BENCHMARK_configure.sh
+ssh root@$BENCHMARK_HOST chmod 770 /tmp/BENCHMARK_configure.sh
ssh $BENCHMARK_HOST /tmp/BENCHMARK_configure.sh
-ssh root@$CLIENT1_HOST chmod 777 /tmp/CLIENT1_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
@@ -188,8 +190,8 @@ ssh $CLIENT1_HOST /tmp/CLIENT1_configure.sh
#ssh root@$CLIENT4_HOST chmod 777 /tmp/CLIENT4_configure.sh
#ssh $CLIENT4_HOST /tmp/CLIENT4_configure.sh
-ssh root@$TOMCAT1_HOST chmod 777 /tmp/TOMCAT1_rubbosSL_configure.sh
-ssh $TOMCAT1_HOST /tmp/TOMCAT1_rubbosSL_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