diff options
| author |   yangyan <yangyanyj@chinamobile.com> | 2020-02-17 16:38:44 +0800 |
|---|---|---|
| committer | Yan Yang <yangyanyj@chinamobile.com> | 2020-02-17 09:37:20 +0000 |
| commit | 725277ea69b1522afbe10a7e1421f8a3b9a5b5cf (patch) | |
| tree | c554465c197f1a6e6dd094d0ab2e141c6546c664 /zte/vmanager/docker | |
| parent | 2038120490e2675e215c72a36b41d718232f1175 (diff) | |
Modify the request by msb with https
Change-Id: I0d3fb55441ebc0f4858c9693c05a154abd6123d5
Issue-ID: VFC-1602
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
Diffstat (limited to 'zte/vmanager/docker')
| -rwxr-xr-x | zte/vmanager/docker/docker-entrypoint.sh | 6 | ||||
| -rwxr-xr-x | zte/vmanager/docker/instance_config.sh | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/zte/vmanager/docker/docker-entrypoint.sh b/zte/vmanager/docker/docker-entrypoint.sh index 38eb4666..0081696d 100755 --- a/zte/vmanager/docker/docker-entrypoint.sh +++ b/zte/vmanager/docker/docker-entrypoint.sh @@ -17,7 +17,11 @@ 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_ADDR > /dev/null && break + curl -sS -m 1 $MSB_PROTO:$MSB_ADDR/msb -k > /dev/null + res=$i? + if [ $res -ne 0 ]; then + break + fi sleep $i done diff --git a/zte/vmanager/docker/instance_config.sh b/zte/vmanager/docker/instance_config.sh index 4995e5ec..fdddff02 100755 --- a/zte/vmanager/docker/instance_config.sh +++ b/zte/vmanager/docker/instance_config.sh @@ -1,8 +1,13 @@ #!/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_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 |