summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryangyan <yangyanyj@chinamobile.com>2020-02-13 10:56:59 +0800
committeryangyan <yangyanyj@chinamobile.com>2020-02-13 11:09:20 +0800
commit2ad400a1d15e38b0deb09a312b11ffb333ec5df5 (patch)
tree3f74b40854ec414374b9b934c0183746996c25bb
parente4bb4ddb3076549a0041b4d2ecca82dc85bdb8aa (diff)
Modify the request by msb with https
Change-Id: Ifff96f74c11cc8407c9428f2342a81e5a1db8de4 Issue-ID: VFC-1602 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
-rwxr-xr-xdocker/instance_config.sh5
-rw-r--r--lcm/pub/config/config.py5
2 files changed, 8 insertions, 2 deletions
diff --git a/docker/instance_config.sh b/docker/instance_config.sh
index 70a3cc6a..9b593312 100755
--- a/docker/instance_config.sh
+++ b/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`
@@ -12,6 +13,10 @@ if [ $REG_TO_MSB_WHEN_START ]; then
sed -i "s|REG_TO_MSB_WHEN_START = .*|REG_TO_MSB_WHEN_START = '$REG_TO_MSB_WHEN_START'|" vfc/nfvo/lcm/lcm/pub/config/config.py
fi
+if [ $MSB_PROTO ]; then
+ sed -i "s|MSB_SERVICE_PROTOCOL = .*|MSB_SERVICE_PROTOCOL = '$MSB_PROTO'|" vfc/nfvo/lcm/lcm/pub/config/config.py
+fi
+
if [ $MSB_IP ]; then
sed -i "s|MSB_SERVICE_IP = .*|MSB_SERVICE_IP = '$MSB_IP'|" vfc/nfvo/lcm/lcm/pub/config/config.py
fi
diff --git a/lcm/pub/config/config.py b/lcm/pub/config/config.py
index f97f1c00..d453480b 100644
--- a/lcm/pub/config/config.py
+++ b/lcm/pub/config/config.py
@@ -13,9 +13,10 @@
# limitations under the License.
# [MSB]
+MSB_SERVICE_PROTOCOL = 'http'
MSB_SERVICE_IP = '10.0.14.1'
-MSB_SERVICE_PORT = '30283'
-MSB_BASE_URL = "https://%s:%s" % (MSB_SERVICE_IP, MSB_SERVICE_PORT)
+MSB_SERVICE_PORT = '443'
+MSB_BASE_URL = "%s://%s:%s" % (MSB_SERVICE_PROTOCOL, MSB_SERVICE_IP, MSB_SERVICE_PORT)
# [REDIS]
REDIS_HOST = '127.0.0.1'