X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docker%2Finstance_init.sh;h=a19e1ce84a07b6176ee7f69eeb9f40ed3e5f77ce;hb=9a409d89ece2c10a60db657da769e4149ff961c5;hp=7e5fcf31ccd363f25c5ed895e463cdc32cb792f6;hpb=de69cceed42b17b97aff28b5dbfb02551848cdcc;p=vfc%2Fnfvo%2Flcm.git

diff --git a/docker/instance_init.sh b/docker/instance_init.sh
index 7e5fcf31..a19e1ce8 100755
--- a/docker/instance_init.sh
+++ b/docker/instance_init.sh
@@ -4,31 +4,24 @@
 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"
 fi
 
-
 function create_database {
-
     cd /service/vfc/nfvo/lcm/resources/bin
     bash initDB.sh $MYSQL_ROOT_USER $MYSQL_ROOT_PASSWORD $MYSQL_PORT $MYSQL_IP
+}
 
- }
 function migrate_database {
     cd /service/vfc/nfvo/lcm
-    python manage.py makemigrations database
     python manage.py migrate
 }
 
+create_database
+migrate_database
 
-GET_NSLCM_DB="show databases like 'vfcnfvolcm';"
-NSLCM_DB=`mysql -u$MYSQL_ROOT_USER -p$MYSQL_ROOT_PASSWORD -P$MYSQL_PORT -h$MYSQL_IP -e "GET_NSLCM_DB"`
-if [[ "$NSLCM_DB" == "" ]]; then
-    create_database
-    migrate_database
-fi