summaryrefslogtreecommitdiffstats
path: root/lcm
diff options
context:
space:
mode:
authoryangyan <yangyanyj@chinamobile.com>2020-02-14 09:48:53 +0800
committerYan Yang <yangyanyj@chinamobile.com>2020-02-14 02:32:35 +0000
commit332d5d1e96b43d7dcf107a33e0f6d74ec08f1c3f (patch)
tree82ff102a69c93487f42ccf30d9c475383567ed2f /lcm
parent57cb6fce97f5f21699521523aa1a1718209d8380 (diff)
Modify the request by msb with https
Change-Id: I6d2e40fa5e0a8d04dcc7533c8a0e76c99ce015cb Issue-ID: VFC-1602 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
Diffstat (limited to 'lcm')
-rwxr-xr-xlcm/docker/instance_config.sh6
-rw-r--r--lcm/lcm/pub/config/config.py3
2 files changed, 8 insertions, 1 deletions
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'