From ea916f0008e5a2bec6730a41bee5fd8324ccebc7 Mon Sep 17 00:00:00 2001
From: dyh <dengyuanhong@chinamobile.com>
Date: Fri, 7 Aug 2020 11:56:22 +0800
Subject: Don't modify the config file with sed in the docker entrypoint script

Change-Id: I233efbe239f95cd145909871b170cb2c5197a27e
Issue-ID: VFC-1623
Signed-off-by: dyh <dengyuanhong@chinamobile.com>
---
 lcm/docker/docker-entrypoint.sh | 38 ++------------------------------
 lcm/docker/instance_config.sh   | 48 -----------------------------------------
 2 files changed, 2 insertions(+), 84 deletions(-)
 delete mode 100755 lcm/docker/instance_config.sh

(limited to 'lcm/docker')

diff --git a/lcm/docker/docker-entrypoint.sh b/lcm/docker/docker-entrypoint.sh
index 9b01804a..f467bd25 100755
--- a/lcm/docker/docker-entrypoint.sh
+++ b/lcm/docker/docker-entrypoint.sh
@@ -1,42 +1,8 @@
 #!/bin/bash
 
-if [ -z "$SERVICE_IP" ]; then
-    export SERVICE_IP=`hostname -i`
-fi
-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"
-
-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..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
-    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
-vfc/gvnfm/vnflcm/lcm/docker/instance_config.sh
+python vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py
+cat vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py
 
 # microservice-specific one-time initialization
 vfc/gvnfm/vnflcm/lcm/docker/instance_init.sh
diff --git a/lcm/docker/instance_config.sh b/lcm/docker/instance_config.sh
deleted file mode 100755
index 0d2cd6c1..00000000
--- a/lcm/docker/instance_config.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-MSB_PROTO=`echo $MSB_PROTO`
-MSB_IP=`echo $MSB_ADDR | cut -d: -f 1`
-MSB_PORT=`echo $MSB_ADDR | cut -d: -f 2`
-
-if [ $MSB_IP ]; then
-    sed -i "s|MSB_SERVICE_IP = .*|MSB_SERVICE_IP = '$MSB_IP'|" vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py
-fi
-
-if [ $MSB_PROTO ]; then
-    sed -i "s|MSB_SERVICE_PROTOCOL = .*|MSB_SERVICE_PROTOCOL = '$MSB_PROTO'|" vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py
-fi
-
-if [ $MSB_PORT ]; then
-    sed -i "s|MSB_SERVICE_PORT = .*|MSB_SERVICE_PORT = '$MSB_PORT'|" vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py
-fi
-
-if [ $SERVICE_IP ]; then
-    sed -i "s|\"ip\": \".*\"|\"ip\": \"$SERVICE_IP\"|" vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py
-fi
-
-if [ $REG_TO_MSB_WHEN_START ]; then
-    sed -i "s|REG_TO_MSB_WHEN_START = .*|REG_TO_MSB_WHEN_START = '$REG_TO_MSB_WHEN_START'|" vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py
-fi
-
-if [ $SSL_ENABLED ]; then
-    sed -i "s|SSL_ENABLED = .*|SSL_ENABLED = '$SSL_ENABLED'|"  vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py
-fi
-
-sed -i "s/127.0.0.1:80/$MSB_IP:$MSB_PORT/" vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py
-
-# Configure MYSQL
-MYSQL_IP=`echo $MYSQL_ADDR | cut -d: -f 1`
-MYSQL_PORT=`echo $MYSQL_ADDR | cut -d: -f 2`
-echo "MYSQL_ADDR=$MYSQL_ADDR"
-
-if [ $REDIS_ADDR ]; then
-    REDIS_IP=`echo $REDIS_ADDR | cut -d: -f 1`
-else
-    REDIS_IP="$MYSQL_ADDR"
-fi
-
-sed -i "s|DB_IP.*|DB_IP = '$MYSQL_IP'|" vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py
-sed -i "s|DB_PORT.*|DB_PORT = $MYSQL_PORT|" vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py
-sed -i "s|REDIS_HOST.*|REDIS_HOST = '$REDIS_IP'|" vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py
-
-cat vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py
-- 
cgit 1.2.3-korg