Merge "Update nslcm release version to 1.3.8"

[vfc/nfvo/lcm.git] / docker / instance_init.sh

diff --git a/docker/instance_init.sh b/docker/instance_init.sh
index 7e5fcf3..a19e1ce 100755 (executable)
--- 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