diff options
| author |   yangyan <yangyanyj@chinamobile.com> | 2020-02-17 16:07:18 +0800 |
|---|---|---|
| committer | Yan Yang <yangyanyj@chinamobile.com> | 2020-02-17 08:43:02 +0000 |
| commit | c414590146754e0f6d60ed1edba385c902b65186 (patch) | |
| tree | 803d1bfe7a17179ee4ce270467903d11b206ea93 /gvnfmadapter/docker | |
| parent | 10fe0e9ae10d5e73ce3dd2145ba06c2d950d92d7 (diff) | |
Modify the request by msb with https
Change-Id: I5a456d9da38fdb1f2818d52df1e2c4ce963bc29b
Issue-ID: VFC-1602
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
Diffstat (limited to 'gvnfmadapter/docker')
| -rwxr-xr-x | gvnfmadapter/docker/docker-entrypoint.sh | 6 | ||||
| -rwxr-xr-x | gvnfmadapter/docker/instance_config.sh | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gvnfmadapter/docker/docker-entrypoint.sh b/gvnfmadapter/docker/docker-entrypoint.sh index 6b54149..753f737 100755 --- a/gvnfmadapter/docker/docker-entrypoint.sh +++ b/gvnfmadapter/docker/docker-entrypoint.sh @@ -14,7 +14,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/gvnfmadapter/docker/instance_config.sh b/gvnfmadapter/docker/instance_config.sh index e69f6d0..a18ae7e 100755 --- a/gvnfmadapter/docker/instance_config.sh +++ b/gvnfmadapter/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/nfvo/driver/vnfm/gvnfm/gvnfmadapter/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/gvnfm/gvnfmadapter/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/gvnfm/gvnfmadapter/driver/pub/config/config.py fi |