diff options
| author |   yangyan <yangyanyj@chinamobile.com> | 2020-02-18 08:53:02 +0800 |
|---|---|---|
| committer | Yan Yang <yangyanyj@chinamobile.com> | 2020-02-18 00:55:24 +0000 |
| commit | 275dd81783aef1e73a59d13788d37d6395430e0f (patch) | |
| tree | 27a7d28c55eb188e236b8f30869df2279a6423fc /mgr/docker | |
| parent | c4b01de0f133e8267f41e21ea3b7e9373fdbbdff (diff) | |
Modify the request by msb with https
Change-Id: I1039e8a4a03a15c5548a91ba1f018d1e7d4d57b5
Issue-ID: VFC-1602
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
Diffstat (limited to 'mgr/docker')
| -rwxr-xr-x | mgr/docker/docker-entrypoint.sh | 6 | ||||
| -rwxr-xr-x | mgr/docker/instance_config.sh | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/mgr/docker/docker-entrypoint.sh b/mgr/docker/docker-entrypoint.sh index ecdd938..55e6890 100755 --- a/mgr/docker/docker-entrypoint.sh +++ b/mgr/docker/docker-entrypoint.sh @@ -20,7 +20,11 @@ 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_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/mgr/docker/instance_config.sh b/mgr/docker/instance_config.sh index 02024d4..3259f48 100755 --- a/mgr/docker/instance_config.sh +++ b/mgr/docker/instance_config.sh @@ -1,5 +1,6 @@ #!/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` @@ -7,6 +8,10 @@ if [ $MSB_IP ]; then sed -i "s|MSB_SERVICE_IP.*|MSB_SERVICE_IP = '$MSB_IP'|" vfc/gvnfm/vnfmgr/mgr/mgr/pub/config/config.py fi +if [ $MSB_PROTO ]; then + sed -i "s|MSB_SERVICE_PROTOCOL = .*|MSB_SERVICE_PROTOCOL = '$MSB_PROTO'|" vfc/gvnfm/vnfmgr/mgr/mgr/pub/config/config.py +fi + if [ $MSB_PORT ]; then sed -i "s|MSB_SERVICE_PORT.*|MSB_SERVICE_PORT = '$MSB_PORT'|" vfc/gvnfm/vnfmgr/mgr/mgr/pub/config/config.py fi |