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

diff --git a/lcm/docker/instance_init.sh b/lcm/docker/instance_init.sh
index 88a9c4e0..9103bd34 100755
--- a/lcm/docker/instance_init.sh
+++ b/lcm/docker/instance_init.sh
@@ -3,9 +3,9 @@
 MYSQL_IP=`echo $MYSQL_ADDR | cut -d: -f 1`
 MYSQL_PORT=`echo $MYSQL_ADDR | cut -d: -f 2`
 
-if [ $MYSQL_AUTH ]; then
-    MYSQL_ROOT_USER=`echo $MYSQL_AUTH | cut -d: -f 1`
-    MYSQL_ROOT_PASSWORD=`echo $MYSQL_AUTH | cut -d: -f 2`
+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"
@@ -18,15 +18,8 @@ function create_database {
 
 function migrate_database {
     cd /service/vfc/gvnfm/vnflcm/lcm
-    python manage.py makemigrations database
-    python manage.py migrate --fake
     python manage.py migrate
 }
 
-GET_VNFM_DB="show databases like 'gvnfm';"
-VNFM_DB=`mysql -u$MYSQL_ROOT_USER -p$MYSQL_ROOT_PASSWORD -P$MYSQL_PORT -h$MYSQL_IP -e "$GET_VNFM_DB"`
-if [[ "$VNFM_DB" == "" ]]; then
-    create_database
-
-fi
+create_database
 migrate_database