Fix database start error in multi-nodes k8s env

[vfc/gvnfm/vnflcm.git] / lcm / docker / instance_init.sh

diff --git a/lcm/docker/instance_init.sh b/lcm/docker/instance_init.sh
index 03c10a8..599584d 100755 (executable)
--- a/lcm/docker/instance_init.sh
+++ b/lcm/docker/instance_init.sh
@@ -1,44 +1,20 @@
 #!/bin/bash
-function install_python_libs {
-    cd /service/vfc/gvnfm/vnflcm/lcm
-    pip install -r requirements.txt
-}
 
 function start_redis_server {
     redis-server &
 }
 
 function start_mysql {
-    service mysql start
-    # Wait for mysql to initialize; Set mysql root password
-    for i in {1..10}; do
-        sleep $i
-        bash /usr/bin/mysqladmin -u root password $MYSQL_ROOT_PASSWORD &> /dev/null && break
-    done
+    find /var/lib/mysql -type f -exec touch {} \; && service mysql start
+    sleep 1
 }
 
 function create_database {
     cd /service/bin
     bash initDB.sh root $MYSQL_ROOT_PASSWORD 3306 127.0.0.1
+    cd /service
 }
 
-function edit_configs {
-    cd /service/vfc/gvnfm/vnflcm/lcm/docker
-    bash instance_config.sh
-}
-
-function start_server {
-    cd /service/vfc/gvnfm/vnflcm/lcm
-    bash run.sh
-}
-
-if [ $MYSQL_ROOT_PASSWORD ]; then
-    install_python_libs
-    start_redis_server
-    start_mysql
-    create_database
-    edit_configs
-    start_server
-else
-    echo "MYSQL_ROOT_PASSWORD environment variable not set."
-fi
+start_redis_server
+start_mysql
+create_database