From: Jun Li <matthew.lijun@huawei.com>
Date: Mon, 21 Dec 2015 02:18:37 +0000 (+0000)
Subject: Merge "Update package prepare scripts"
X-Git-Tag: brahmaputra.1.0~55
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=045442ff03278057d3a77f1301ab4f8ef5068741;hp=-c;p=bottlenecks.git

Merge "Update package prepare scripts"
---

045442ff03278057d3a77f1301ab4f8ef5068741
diff --combined rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
index bdbb999f,4fd7e9b1..b2aacea8
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
@@@ -11,15 -11,6 +11,6 @@@ scp $scp_options ../set_bottlenecks_rub
  
  ssh $TOMCAT1_HOST "mkdir -p $SOFTWARE_HOME"
  
- ssh $TOMCAT1_HOST "
-     apt-get update
-     apt-get install -y \
-         gcc \
-         gettext \
-         g++ \
-         make
- "
- 
  for i in $TOMCAT_TARBALL $JAVA_TARBALL $J2EE_TARBALL $ANT_TARBALL
  do
      scp $scp_options $SOFTWARE_HOME/$i $TOMCAT1_HOST:$SOFTWARE_HOME/$i
@@@ -39,7 -30,7 +30,7 @@@ f
  # Packages for TOMCAT1 configure
  if true; then
  ssh $TOMCAT1_HOST "mkdir -p $OUTPUT_HOME/tomcat_conf"
 -scp $scp_options $OUTPUT_HOME/tomcat_conf/server.xml-$HOSTNAME $TOMCAT1_HOST:$OUTPUT_HOME/tomcat_conf/server.xml-$HOSTNAME
 +scp $scp_options $OUTPUT_HOME/tomcat_conf/server.xml $TOMCAT1_HOST:$OUTPUT_HOME/tomcat_conf/server.xml
  fi
  
  # Packages for TOMCAT1 rubbosSL configure
diff --combined rubbos/rubbos_scripts/1-1-1/scripts/run.sh
index 9e523c3d,ea9ab36e..b9014f0f
--- a/rubbos/rubbos_scripts/1-1-1/scripts/run.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/run.sh
@@@ -1,6 -1,3 +1,6 @@@
 +#!/bin/bash
 +set -x
 +
  cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
  source set_bottlenecks_rubbos_env.sh
  cd /bottlenecks/rubbos/rubbos_scripts/1-1-1/scripts
@@@ -117,7 -114,8 +117,8 @@@ d
  done
  
  ssh root@$MYSQL1_HOST chmod 770 /tmp/MYSQL1_configure.sh
- ssh $MYSQL1_HOST /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
@@@ -140,4 -138,3 +141,4 @@@ ssh $TOMCAT1_HOST /tmp/TOMCAT1_rubbosSL
  
  ssh $CONTROL_HOST /tmp/CONTROL_rubbos_exec.sh
  
 +set +x