From 332d5d1e96b43d7dcf107a33e0f6d74ec08f1c3f Mon Sep 17 00:00:00 2001 From: yangyan Date: Fri, 14 Feb 2020 09:48:53 +0800 Subject: [PATCH] Modify the request by msb with https Change-Id: I6d2e40fa5e0a8d04dcc7533c8a0e76c99ce015cb Issue-ID: VFC-1602 Signed-off-by: yangyan --- lcm/docker/instance_config.sh | 6 ++++++ lcm/lcm/pub/config/config.py | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lcm/docker/instance_config.sh b/lcm/docker/instance_config.sh index 9257c9ff..6e468843 100755 --- a/lcm/docker/instance_config.sh +++ b/lcm/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,11 @@ if [ $MSB_IP ]; then sed -i "s|MSB_SERVICE_IP = .*|MSB_SERVICE_IP = '$MSB_IP'|" vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py fi +if [ $MSB_PROTO ]; then + sed -i "s|MSB_SERVICE_PROTOCOL = .*|MSB_SERVICE_PROTOCOL = '$MSB_PROTO'|" vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py +fi + + if [ $MSB_PORT ]; then sed -i "s|MSB_SERVICE_PORT = .*|MSB_SERVICE_PORT = '$MSB_PORT'|" vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py fi diff --git a/lcm/lcm/pub/config/config.py b/lcm/lcm/pub/config/config.py index 27896d06..b153aee8 100644 --- a/lcm/lcm/pub/config/config.py +++ b/lcm/lcm/pub/config/config.py @@ -13,9 +13,10 @@ # limitations under the License. # [MSB] +MSB_SERVICE_PROTOCOL = 'https' MSB_SERVICE_IP = '127.0.0.1' MSB_SERVICE_PORT = '443' -MSB_BASE_URL = "https://%s:%s" % (MSB_SERVICE_IP, MSB_SERVICE_PORT) +MSB_BASE_URL = "%s://%s:%s" % (MSB_SERVICE_PROTOCOL, MSB_SERVICE_IP, MSB_SERVICE_PORT) # [REDIS] REDIS_HOST = '127.0.0.1' -- 2.16.6