summaryrefslogtreecommitdiffstats
path: root/zte
diff options
context:
space:
mode:
authoryangyan <yangyanyj@chinamobile.com>2020-02-28 20:29:18 +0800
committerYan Yang <yangyanyj@chinamobile.com>2020-02-28 12:30:02 +0000
commit9f68abe303fd8184ef824d62c31742fecc777fa1 (patch)
treec4c60083ccaf3d0fec118219fec01a203d5fa4c7 /zte
parent82a619e9ddeeef1a6fcf334d37334e1a7e45c22b (diff)
Change the MSB registration switch to the environment variable acquisition mode and fix typo error
Change-Id: Ie6f21aad4cd9e571d3e58eaa498d1fb68470d94f Issue-ID: VFC-1601 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
Diffstat (limited to 'zte')
-rwxr-xr-xzte/vmanager/docker/docker-entrypoint.sh4
-rwxr-xr-xzte/vmanager/docker/instance_config.sh4
2 files changed, 6 insertions, 2 deletions
diff --git a/zte/vmanager/docker/docker-entrypoint.sh b/zte/vmanager/docker/docker-entrypoint.sh
index 0081696d..3c731640 100755
--- a/zte/vmanager/docker/docker-entrypoint.sh
+++ b/zte/vmanager/docker/docker-entrypoint.sh
@@ -17,8 +17,8 @@ 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=$i?
+ curl -sS -m 1 $MSB_PROTO://$MSB_ADDR/msb -k > /dev/null
+ res=$?
if [ $res -ne 0 ]; then
break
fi
diff --git a/zte/vmanager/docker/instance_config.sh b/zte/vmanager/docker/instance_config.sh
index fdddff02..7011f11f 100755
--- a/zte/vmanager/docker/instance_config.sh
+++ b/zte/vmanager/docker/instance_config.sh
@@ -4,6 +4,10 @@ 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