summaryrefslogtreecommitdiffstats
path: root/rubbos
diff options
context:
space:
mode:
authorQiLiang <liangqi1@huawei.com>2015-12-12 00:29:13 +0000
committerQiLiang <liangqi1@huawei.com>2015-12-12 00:29:13 +0000
commit9ffc70b519ff244ca0501f11de00234f4d423c14 (patch)
tree7bac4373936be9588d071732cb7721dd49472650 /rubbos
parent7103f63993649643ea8f840e2122ad822d324d9b (diff)
Update Tomcat configure
Scripts update to support tomcat install in a clean ubuntu 14.04 OS JIRA:BOTTLENECK-24 Change-Id: Ida708ad37ba4409b15bdeed98d7f369ccdab44c5 Signed-off-by: QiLiang <liangqi1@huawei.com>
Diffstat (limited to 'rubbos')
-rw-r--r--rubbos/rubbos_scripts/1-1-1/rubbos_conf/mysql.properties6
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh55
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_install.sh8
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/run.sh23
4 files changed, 85 insertions, 7 deletions
diff --git a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/mysql.properties b/rubbos/rubbos_scripts/1-1-1/rubbos_conf/mysql.properties
index 3c8c0add..a8ee8fe9 100644
--- a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/mysql.properties
+++ b/rubbos/rubbos_scripts/1-1-1/rubbos_conf/mysql.properties
@@ -8,11 +8,11 @@
#
datasource.name mysql
-datasource.url jdbc:mysql://node9:3313/rubbos
+datasource.url jdbc:mysql://192.168.122.13:3313/rubbos
datasource.classname com.mysql.jdbc.Driver
-datasource.username elba
-datasource.password elba
+datasource.username rubbos
+datasource.password rubbos
#####
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
new file mode 100755
index 00000000..9e0783c5
--- /dev/null
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+. ../set_bottlenecks_rubbos_env.sh
+
+scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
+
+# Packages for TOMCAT1 install
+if true; then
+ssh $TOMCAT1_HOST "mkdir -p /bottlenecks/rubbos/rubbos_scripts/1-1-1"
+scp $scp_options ../set_bottlenecks_rubbos_env.sh $TOMCAT1_HOST:/bottlenecks/rubbos/rubbos_scripts/1-1-1
+
+ssh $TOMCAT1_HOST "mkdir -p $SOFTWARE_HOME"
+
+ssh $TOMCAT1_HOST "
+ apt-get update
+ apt-get install -y \
+ gcc \
+ 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
+done
+
+fi
+
+# Packages for TOMCAT1 rubbos install
+if true; then
+scp $scp_options $SOFTWARE_HOME/$RUBBOS_TARBALL $TOMCAT1_HOST:$SOFTWARE_HOME/$RUBBOS_TARBALL
+scp $scp_options $SOFTWARE_HOME/flush_cache $TOMCAT1_HOST:$SOFTWARE_HOME/flush_cache
+scp $scp_options $SOFTWARE_HOME/$SYSSTAT_TARBALL $TOMCAT1_HOST:$SOFTWARE_HOME/$SYSSTAT_TARBALL
+ssh $TOMCAT1_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+scp $scp_options $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $TOMCAT1_HOST:$OUTPUT_HOME/rubbos_conf/cpu_mem.sh
+fi
+
+# 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
+fi
+
+# Packages for TOMCAT1 rubbosSL configure
+if true; then
+ssh $TOMCAT1_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+for i in build.properties mysql.properties build.xml Config.java web.xml
+do
+ scp $scp_options $OUTPUT_HOME/rubbos_conf/$i $TOMCAT1_HOST:$OUTPUT_HOME/rubbos_conf/$i
+done
+
+ssh $TOMCAT1_HOST "mkdir -p $WORK_HOME/rubbos_files"
+scp $scp_options -r $WORK_HOME/rubbos_files/Servlets $TOMCAT1_HOST:$WORK_HOME/rubbos_files/Servlets
+fi
+
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_install.sh
index 1027cc71..26c0ae2c 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_install.sh
@@ -15,10 +15,10 @@ mkdir -p $SYSSTAT_HOME
# install sysstat
tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
-cd $SYSSTAT_HOME
-./configure --prefix=$SYSSTAT_HOME
-make
-sudo make install
+#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 b30276fa..31b51b25 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/run.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/run.sh
@@ -14,21 +14,44 @@ for script in HTTPD_install.sh HTTPD_rubbos_install.sh \
do
scp $scp_options $script $HTTPD_HOST:/tmp
done
+fi
+if true; then
+for script in TOMCAT1_install.sh TOMCAT1_rubbos_install.sh \
+ TOMCAT1_configure.sh TOMCAT1_rubbosSL_configure.sh \
+ TOMCAT1_ignition.sh TOMCAT1_stop.sh \
+ TOMCAT1_rubbos_uninstall.sh TOMCAT1_uninstall.sh
+do
+ scp $scp_options $script $TOMCAT1_HOST:/tmp
+done
fi
+
# Prepare software packages
echo "*** prepare software packages ***"
./HTTPD_pkg_prepare.sh
+./TOMCAT1_pkg_prepare.sh
# Install and Configure and run Apache, Tomcat, CJDBC, and MySQL
echo "*** install scripts & configure & execute ***********************"
+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@$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@$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@$TOMCAT1_HOST chmod 770 /tmp/TOMCAT1_rubbosSL_configure.sh
+ssh $TOMCAT1_HOST /tmp/TOMCAT1_rubbosSL_configure.sh
+