X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Fdocker%2Finstance_init.sh;h=9103bd349874ca3932e093e88a3668af678bf8e8;hb=229e785b8679eadcc58a7165d134ea56bdaf1ac1;hp=ecf9e86efd3a4454c8e0550ad7cc14f86b2d1a6d;hpb=452c2b042e394d6634d8e457c338607d4f92a09c;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/docker/instance_init.sh b/lcm/docker/instance_init.sh
index ecf9e86e..9103bd34 100755
--- a/lcm/docker/instance_init.sh
+++ b/lcm/docker/instance_init.sh
@@ -1,39 +1,25 @@
 #!/bin/bash
-function install_python_libs {
-    cd /service/vfc/gvnfm/vnflcm/lcm
-    pip install -r requirements.txt
-}
 
-function start_redis_server {
-    redis-server &
-}
+MYSQL_IP=`echo $MYSQL_ADDR | cut -d: -f 1`
+MYSQL_PORT=`echo $MYSQL_ADDR | cut -d: -f 2`
 
-function start_mysql {
-    service mysql start
-}
+if [ $MYSQL_ROOT_USER ] && [ $MYSQL_ROOT_PASSWORD ]; then
+    MYSQL_ROOT_USER=$MYSQL_ROOT_USER
+    MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD
+else
+    MYSQL_ROOT_USER="root"
+    MYSQL_ROOT_PASSWORD="root"
+fi
 
 function create_database {
-    cd /service/bin
-    bash initDB.sh root $MYSQL_ROOT_PASSWORD 3306 127.0.0.1
-}
-
-function edit_configs {
-    cd /service/vfc/gvnfm/vnflcm/lcm/docker
-    bash instance_config.sh
+    cd /service/vfc/gvnfm/vnflcm/lcm/resources/bin
+    bash initDB.sh $MYSQL_ROOT_USER $MYSQL_ROOT_PASSWORD $MYSQL_PORT $MYSQL_IP
 }
 
-function start_server {
+function migrate_database {
     cd /service/vfc/gvnfm/vnflcm/lcm
-    bash run.sh
+    python manage.py migrate
 }
 
-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
+create_database
+migrate_database