summaryrefslogtreecommitdiffstats
path: root/rubbos/rubbos_scripts
diff options
context:
space:
mode:
authorpanghao <shamrock.pang@huawei.com>2015-12-17 03:16:48 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-12-17 03:16:48 +0000
commit833d16b53e59967db779b0eba37d4f7481cb94e9 (patch)
tree7b82e4eeaf6f5b704a1b949b3ad77a9ecde491a5 /rubbos/rubbos_scripts
parente3d9ae4123b420f8fa06a794062f67045dbac2b0 (diff)
parent9e1fe50a5af8a5eb549a03014329a206bfbf2650 (diff)
Merge "fix bugs of installing mysql"
Diffstat (limited to 'rubbos/rubbos_scripts')
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_configure.sh13
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_install.sh14
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_pkg_prepare.sh6
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh4
4 files changed, 23 insertions, 14 deletions
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_configure.sh b/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_configure.sh
index 01a718d9..7b3707da 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_configure.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_configure.sh
@@ -22,7 +22,7 @@ fi
ln -s $MYSQL_HOME/bin/mysql /usr/local/bin/mysql
sleep 20
-
+echo "BEGIN MYSQL GIVE PRIVILEGES"
cat << EOF | mysql -uroot
CREATE DATABASE rubbos;
@@ -34,9 +34,14 @@ GRANT ALL PRIVILEGES ON rubbos.* TO 'rubbos'@'localhost' \
IDENTIFIED BY 'rubbos';
flush privileges;
EOF
+echo "END MYSQL GIVE PRIVILEGES"
-tar xzf /tmp/$RUBBOS_DATA_TARBALL
-mysql -uroot rubbos < $RUBBOS_DATA_SQL
-rm $RUBBOS_DATA_SQL
+echo "BEGIN IMPORT SQL DATA"
+echo "software_home=$SOFTWARE_HOME"
+tar xzf $SOFTWARE_HOME/$RUBBOS_DATA_TARBALL --directory /tmp
+mysql -uroot rubbos < /tmp/$RUBBOS_DATA_SQL
+echo "END IMPORT SQL DATA"
+rm /tmp/$RUBBOS_DATA_SQL
echo "DONE CONFIGURING MYSQL on $HOSTNAME"
+
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_install.sh
index c716a171..e3a4409c 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_install.sh
@@ -13,21 +13,21 @@ mkdir -p $RUBBOS_APP
chmod 755 $RUBBOS_APP
cd /root
-groupadd bottlenecks
-useradd -r -g bottlenecks $BOTTLENECKS_USER
+groupadd mysql
+useradd -r -g mysql $BOTTLENECKS_USER
tar xzf $SOFTWARE_HOME/$MYSQL_TARBALL --directory=$RUBBOS_APP
cd /usr/local
ln -s $MYSQL_HOME mysql
cd mysql
chown -R $BOTTLENECKS_USER .
-chgrp -R bottlenecks .
+chgrp -R mysql .
#scripts/mysql_install_db --verbose --user=$BOTTLENECKS_USER --basedir=$MYSQL_HOME --datadir=$MYSQL_DATA_DIR
scripts/mysql_install_db --user=$BOTTLENECKS_USER
chown -R root .
-chown -R $BOTTLENECKS_USER data
-
+chown -R $BOTTLENECKS_USER data
+
#echo "begin install mysql"
-#cd $MYSQL_HOME
+#cd $MYSQL_HOME
#scripts/mysql_install_db --no-defaults --user=root --basedir=$MYSQL_HOME --port=$MYSQL_PORT --datadir=$MYSQL_DATA_DIR --log=$MYSQL_ERR_LOG --pid-file=$MYSQL_PID_FILE --socket=$MYSQL_SOCKET
-echo "DONE INSTALLING MYSQL on $HOSTNAME"
+echo "DONE INSTALLING MYSQL on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_pkg_prepare.sh
index 79cf6e2f..cd95eb8a 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_pkg_prepare.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_pkg_prepare.sh
@@ -1,16 +1,19 @@
#!/bin/bash
-. ../set_bottlenecks_rubbos_env.sh
+source ../set_bottlenecks_rubbos_env.sh
scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
# Packages for MYSQL1 install
+echo "MYSQL PREPARE DEPENDANT LIBRARY BEGIN"
if true; then
ssh $MYSQL1_HOST "mkdir -p /bottlenecks/rubbos/rubbos_scripts/1-1-1"
scp $scp_options ../set_bottlenecks_rubbos_env.sh $MYSQL1_HOST:/bottlenecks/rubbos/rubbos_scripts/1-1-1
+ssh $MYSQL1_HOST "echo 'nameserver 8.8.4.4' >> /etc/resolv.conf"
ssh $MYSQL1_HOST "mkdir -p $SOFTWARE_HOME"
scp $scp_options $SOFTWARE_HOME/$MYSQL_TARBALL $MYSQL1_HOST:$SOFTWARE_HOME/$MYSQL_TARBALL
+scp $scp_options $SOFTWARE_HOME/$RUBBOS_DATA_TARBALL $MYSQL1_HOST:$SOFTWARE_HOME/$RUBBOS_DATA_TARBALL
ssh $MYSQL1_HOST "
apt-get update
@@ -24,6 +27,7 @@ ssh $MYSQL1_HOST "
"
fi
+echo "MYSQL PREPARE DEPENDANT LIBRARY END"
# Packages for MYSQL1 rubbos install
if true; then
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 79fcb0e9..3008c4c2 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
@@ -76,8 +76,8 @@ MYSQL_PID_FILE=$MYSQL_HOME/run/mysqld.pid
# for DBs & C-JDBC
ROOT_PASSWORD=new-password
-BOTTLENECKS_USER=bottlenecks
-BOTTLENECKS_PASSWORD=bottlenecks
+BOTTLENECKS_USER=mysql
+BOTTLENECKS_PASSWORD=mysql
CLASSPATH=$CLASSPATH:$JONAS_ROOT/bin/unix/registry:$JAVA_HOME:$JAVA_HOME/lib/tools.jar:$SERVLET_API_PATH:.