summaryrefslogtreecommitdiffstats
path: root/zte/vmanager/docker
diff options
context:
space:
mode:
authordyh <dengyuanhong@chinamobile.com>2020-08-07 18:01:17 +0800
committerdyh <dengyuanhong@chinamobile.com>2020-08-07 18:02:15 +0800
commit81529f59455b00b2aa0e7b36f8dee872567143a3 (patch)
treef686438048b12c141f199383a0a26f32b48975b8 /zte/vmanager/docker
parent74ba762f073486fe383f4d2dbd304d07a56028f1 (diff)
Don't modify the config file with sed in the docker entrypoint script
Change-Id: Iac13019024cb5d6c05a32ae358e1892e025f95dc Issue-ID: VFC-1623 Signed-off-by: dyh <dengyuanhong@chinamobile.com>
Diffstat (limited to 'zte/vmanager/docker')
-rwxr-xr-xzte/vmanager/docker/docker-entrypoint.sh25
-rwxr-xr-xzte/vmanager/docker/instance_config.sh27
2 files changed, 2 insertions, 50 deletions
diff --git a/zte/vmanager/docker/docker-entrypoint.sh b/zte/vmanager/docker/docker-entrypoint.sh
index 38ea9778..20bc97f9 100755
--- a/zte/vmanager/docker/docker-entrypoint.sh
+++ b/zte/vmanager/docker/docker-entrypoint.sh
@@ -1,29 +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"
-
-# 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
-
# Configure service based on docker environment variables
-vfc/nfvo/driver/vnfm/svnfm/zte/vmanager/docker/instance_config.sh
+python vfc/nfvo/driver/vnfm/svnfm/zte/vmanager/driver/pub/config/config.py
+cat vfc/nfvo/driver/vnfm/svnfm/zte/vmanager/driver/pub/config/config.py
# microservice-specific one-time initialization
vfc/nfvo/driver/vnfm/svnfm/zte/vmanager/docker/instance_init.sh
diff --git a/zte/vmanager/docker/instance_config.sh b/zte/vmanager/docker/instance_config.sh
deleted file mode 100755
index 3abc85c1..00000000
--- a/zte/vmanager/docker/instance_config.sh
+++ /dev/null
@@ -1,27 +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 [ $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/nfvo/driver/vnfm/svnfm/zte/vmanager/driver/pub/config/config.py
-fi
-
-if [ $MSB_PROTO ]; then
- sed -i "s|MSB_SERVICE_PROTOCOL = .*|MSB_SERVICE_PROTOCOL = '$MSB_PROTO'|" vfc/nfvo/driver/vnfm/svnfm/zte/vmanager/driver/pub/config/config.py
-fi
-
-if [ $MSB_IP ]; then
- sed -i "s|MSB_SERVICE_IP = .*|MSB_SERVICE_IP = '$MSB_IP'|" vfc/nfvo/driver/vnfm/svnfm/zte/vmanager/driver/pub/config/config.py
-fi
-
-if [ $MSB_PORT ]; then
- sed -i "s|MSB_SERVICE_PORT = .*|MSB_SERVICE_PORT = '$MSB_PORT'|" vfc/nfvo/driver/vnfm/svnfm/zte/vmanager/driver/pub/config/config.py
-fi
-
-if [ $SERVICE_IP ]; then
- sed -i "s|\"ip\": \".*\"|\"ip\": \"$SERVICE_IP\"|" vfc/nfvo/driver/vnfm/svnfm/zte/vmanager/driver/pub/config/config.py
-fi
-
-cat vfc/nfvo/driver/vnfm/svnfm/zte/vmanager/driver/pub/config/config.py