X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Fdocker%2Finstance_init.sh;h=aa04c5d8a3132367af5948f55276708d41179daf;hb=39434e7941976c1fc0b00e55b114615c7b659473;hp=f33294db255d84673131cbc5935293394bb6cb7d;hpb=0750bee8cfa8612105455bea35b5514b193354a5;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/docker/instance_init.sh b/lcm/docker/instance_init.sh
index f33294db..aa04c5d8 100755
--- a/lcm/docker/instance_init.sh
+++ b/lcm/docker/instance_init.sh
@@ -1,29 +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 {
-    su mysql -c /usr/bin/mysqld_safe &
-    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
-}
+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
+    cd /service/vfc/gvnfm/vnflcm/lcm/resources/bin
+    bash initDB.sh $MYSQL_ROOT_USER $MYSQL_ROOT_PASSWORD $MYSQL_PORT $MYSQL_IP
+}
+
+function migrate_database {
+    cd /service/vfc/gvnfm/vnflcm/lcm
+    python manage.py migrate
 }
 
-install_python_libs
-start_redis_server
-start_mysql
 create_database
+migrate_database