Merge "Two main process in vfc huawei vnfm pod Issue-ID: VFC-1692"

[vfc/nfvo/driver/vnfm/svnfm.git] / huawei / vnfmadapter / VnfmadapterService / docker / docker-entrypoint.sh

diff --git a/huawei/vnfmadapter/VnfmadapterService/docker/docker-entrypoint.sh b/huawei/vnfmadapter/VnfmadapterService/docker/docker-entrypoint.sh
index 756024c..9cfd4dc 100755 (executable)
--- a/huawei/vnfmadapter/VnfmadapterService/docker/docker-entrypoint.sh
+++ b/huawei/vnfmadapter/VnfmadapterService/docker/docker-entrypoint.sh
@@ -27,36 +27,30 @@ echo
 echo Environment Variables:
 echo "SERVICE_IP=$SERVICE_IP"
 
-#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"
-#echo
+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"
+echo
 
-## Wait for MSB initialization
-#echo Wait for MSB initialization
-#for i in {1..20}; do
-#    curl -sS -m 1 $MSB_ADDR > /dev/null && break
-#    sleep $i
-#done
+# Wait for MSB initialization
+echo Wait for MSB initialization
+for i in {1..5}; do
+    curl -sS -m 1 $MSB_ADDR > /dev/null && break
+    sleep $i
+done
 
 echo
 
 # Configure service based on docker environment variables
 ./instance-config.sh
 
-# Start mysql
-su mysql -c /usr/bin/mysqld_safe &
-
 # Perform one-time config
 if [ ! -e init.log ]; then
     # Perform workarounds due to defects in release binary
     ./instance-workaround.sh
 
-    # Init mysql; set root password
-    ./init-mysql.sh
-
     # microservice-specific one-time initialization
     ./instance-init.sh