X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Finfra_setup%2Fvm_dev_setup%2Fsetup_env.sh;h=bd0ffb56af867f5894572d37f0ae95d865e107bd;hb=52b57789e3a3bee43398d3786d656c56007c113a;hp=d09bc77434a74a405a56b4e5858f02774c337f15;hpb=9d958be25bb348ab08f320b04b8a0e47cce11945;p=bottlenecks.git

diff --git a/utils/infra_setup/vm_dev_setup/setup_env.sh b/utils/infra_setup/vm_dev_setup/setup_env.sh
index d09bc774..bd0ffb56 100755
--- a/utils/infra_setup/vm_dev_setup/setup_env.sh
+++ b/utils/infra_setup/vm_dev_setup/setup_env.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -ex
+set -x
 
 wait_vm_ok() {
     ip=$1
@@ -36,8 +36,8 @@ bottlenecks_prepare_env()
     for i in $rubbos_benchmark $rubbos_client1 $rubbos_client2 \
              $rubbos_client3 $rubbos_client4 $rubbos_httpd $rubbos_mysql1 $rubbos_tomcat1
     do
-          scp $ssh_args -r $SCRIPT_DIR ec2-user@$i:$SCRIPT_DIR
-          ssh $ssh_args ec2-user@$i "sudo bash $SCRIPT_DIR/vm_prepare_setup.sh"
+          scp $ssh_args -r $SCRIPT_DIR ec2-user@$i:/tmp
+          ssh $ssh_args ec2-user@$i "sudo bash $SCRIPT_DIR/vm_prepare_setup.sh" &
     done
 
     # ugly use ssh execute script to fix ec2-user previlege issue
@@ -55,7 +55,7 @@ bottlenecks_download_repo()
 {
     echo "Bottlenecks: download bottlenecks repo"
 
-    if [ -d $BOTTELENECKS_REPO_DIR/.git ]; then
+    if [ -d $BOTTLENECKS_REPO_DIR/.git ]; then
         cd $BOTTLENECKS_REPO_DIR
         sudo git pull origin master
         if [ x"$GERRIT_REFSPEC_DEBUG" != x ]; then
@@ -74,7 +74,7 @@ bottlenecks_download_repo()
 
 bottlenecks_config_hosts_ip()
 {
-    sed -i -e "s/REPLACE_CONTROL_HOST/$rubbos_control/g" \
+    sudo sed -i -e "s/REPLACE_CONTROL_HOST/$rubbos_control/g" \
            -e "s/REPLACE_HTTPD_HOST/$rubbos_httpd/g" \
            -e "s/REPLACE_MYSQL1_HOST/$rubbos_mysql1/g" \
            -e "s/REPLACE_TOMCAT1_HOST/$rubbos_tomcat1/g" \
@@ -83,7 +83,7 @@ bottlenecks_config_hosts_ip()
            -e "s/REPLACE_CLIENT3_HOST/$rubbos_client3/g" \
            -e "s/REPLACE_CLIENT4_HOST/$rubbos_client4/g" \
            -e "s/REPLACE_BENCHMARK_HOST/$rubbos_benchmark/g" \
-           $BOTTELENECKS_REPO_DIR/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh
+           $BOTTLENECKS_REPO_DIR/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh
 }
 
 bottlenecks_download_packages()
@@ -119,9 +119,10 @@ main()
 
     bottlenecks_prepare_env
     bottlenecks_download_repo
+    bottlenecks_config_hosts_ip
     bottlenecks_download_packages
     bottlenecks_rubbos_install_exe
 }
 
 main
-set +ex
+set +x