X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Fdocker%2Fdocker-entrypoint.sh;h=0e1abc936c48212f6d7c7376238c10bf2ddd4f50;hb=39434e7941976c1fc0b00e55b114615c7b659473;hp=90341e832395d6d308931621cde18e18bf10cd83;hpb=0750bee8cfa8612105455bea35b5514b193354a5;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/docker/docker-entrypoint.sh b/lcm/docker/docker-entrypoint.sh
index 90341e83..0e1abc93 100755
--- a/lcm/docker/docker-entrypoint.sh
+++ b/lcm/docker/docker-entrypoint.sh
@@ -1,35 +1,49 @@
 #!/bin/bash
 
+find  /service -name '*.sh'|xargs chmod a+x
+
 if [ -z "$SERVICE_IP" ]; then
     export SERVICE_IP=`hostname -i`
 fi
 echo "SERVICE_IP=$SERVICE_IP"
 
-if [ -z "$MYSQL_ROOT_PASSWORD" ]; then
-    export MYSQL_ROOT_PASSWORD="root"
-fi
-echo "MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD"
-
 if [ -z "$MSB_ADDR" ]; then
     echo "Missing required variable MSB_ADDR: Microservices Service Bus address <ip>:<port>"
     exit 1
 fi
 echo "MSB_ADDR=$MSB_ADDR"
 
+if [ -z "$MYSQL_ADDR" ]; then
+    echo "Missing required variable MYSQL_ADDR: <ip>:<port>"
+    exit 1
+fi
+echo "MYSQL_ADDR=$MYSQL_ADDR"
+
 # Wait for MSB initialization
 echo "Wait for MSB initialization"
-for i in {1..20}; do
-    curl -sS -m 1 $MSB_ADDR > /dev/null && break
+for i in {1..5}; do
+    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
 done
 
 # Configure service based on docker environment variables
-./instance-config.sh
+vfc/gvnfm/vnflcm/lcm/docker/instance_config.sh
 
 # microservice-specific one-time initialization
-./instance-init.sh
+vfc/gvnfm/vnflcm/lcm/docker/instance_init.sh
 
 date > init.log
 
 # Start the microservice
-./instance-run.sh
+vfc/gvnfm/vnflcm/lcm/docker/instance_run.sh