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

diff --git a/lcm/docker/instance_init.sh b/lcm/docker/instance_init.sh
index ceaf0b20..aa04c5d8 100755
--- a/lcm/docker/instance_init.sh
+++ b/lcm/docker/instance_init.sh
@@ -3,12 +3,12 @@
 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"
+     MYSQL_ROOT_USER="root"
+     MYSQL_ROOT_PASSWORD="root"
 fi
 
 function create_database {
@@ -18,14 +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
-    migrate_database
-fi
+create_database
+migrate_database