Modify DB initialization completion judgment flag

[vfc/gvnfm/vnflcm.git] / lcm / docker / docker-entrypoint.sh

diff --git a/lcm/docker/docker-entrypoint.sh b/lcm/docker/docker-entrypoint.sh
index ed41382..4ba0757 100755 (executable)
--- a/lcm/docker/docker-entrypoint.sh
+++ b/lcm/docker/docker-entrypoint.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+find  /service -name '*.sh'|xargs chmod a+x
+
 if [ -z "$SERVICE_IP" ]; then
     export SERVICE_IP=`hostname -i`
 fi
@@ -20,15 +22,19 @@ echo "MYSQL_ADDR=$MYSQL_ADDR"
 # Wait for MSB initialization
 echo "Wait for MSB initialization"
 for i in {1..5}; do
-    curl -sS -m 1 $MSB_ADDR > /dev/null && break
+    curl -sS -m 1 $MSB_PROTO://$MSB_ADDR/msb -k > /dev/null
+    res=$?
+    if [ $res -ne 0 ]; then
+        break
+    fi
     sleep $i
 done
 
 # Wait for DB initialization
 echo "Wait for DB initialization"
 for i in {1..5}; do
-    curl -sS -m 1 $MYSQL_ADDR > /dev/null && break
-    sleep $i
+    mysql -u$MYSQL_ROOT_USER -p$MYSQL_ROOT_PASSWORD -h`echo $MYSQL_ADDR | cut -d: -f 1` -P`echo $MYSQL_ADDR | cut -d: -f 2` -e "show databases;" > /dev/null && echo "DB initialization completed" && break
+    sleep $i && echo "`echo $MYSQL_ADDR | cut -d: -f 1` connection failed"
 done
 
 # Configure service based on docker environment variables