From: fujinhua <fu.jinhua@zte.com.cn>
Date: Tue, 16 Apr 2019 04:13:17 +0000 (+0800)
Subject: Fix docker init sh for nslcm
X-Git-Tag: 1.3.0~30
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=dfe17e42ca2c6236a55f47a40a120a2a143b839d;p=vfc%2Fnfvo%2Flcm.git

Fix docker init sh for nslcm

Change-Id: Ia94ec527150cffdd503a71b248968b7a98abf2c4
Issue-ID: VFC-1306
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
---

diff --git a/docker/instance_init.sh b/docker/instance_init.sh
index 8cf31ca6..fdf64736 100755
--- a/docker/instance_init.sh
+++ b/docker/instance_init.sh
@@ -12,25 +12,15 @@ else
     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 --fake
     python manage.py migrate
 }
 
-
-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
-
+create_database
+migrate_database