summaryrefslogtreecommitdiffstats
path: root/ocata
diff options
context:
space:
mode:
authorBin Yang <bin.yang@windriver.com>2020-02-03 18:49:15 +0800
committerBin Yang <bin.yang@windriver.com>2020-02-03 18:49:15 +0800
commit74278035bbbb535274f74bb00c4e71eb4daf2fe2 (patch)
tree25e08619e3191a084587a72676762b5dbff58baa /ocata
parent5f8e9379af90e81ad4a4d27b8cf6afb6edb40569 (diff)
Enable the usage of msb https endpoint
Change-Id: I96ef526f1aa99415f45bc8dfdd8d737f8bd5eed5 Issue-ID: MULTICLOUD-978 Signed-off-by: Bin Yang <bin.yang@windriver.com>
Diffstat (limited to 'ocata')
-rw-r--r--ocata/docker/Dockerfile1
-rw-r--r--ocata/ocata/settings.py10
2 files changed, 7 insertions, 4 deletions
diff --git a/ocata/docker/Dockerfile b/ocata/docker/Dockerfile
index dffd40bc..c4fa139a 100644
--- a/ocata/docker/Dockerfile
+++ b/ocata/docker/Dockerfile
@@ -20,6 +20,7 @@ ARG HTTPS_PROXY=${HTTPS_PROXY}
ENV http_proxy $HTTP_PROXY
ENV https_proxy $HTTPS_PROXY
+ENV MSB_PROTO "http"
ENV MSB_ADDR "127.0.0.1"
ENV MSB_PORT "80"
ENV AAI_ADDR "aai.api.simpledemo.openecomp.org"
diff --git a/ocata/ocata/settings.py b/ocata/ocata/settings.py
index dd59f6bb..9ab7989e 100644
--- a/ocata/ocata/settings.py
+++ b/ocata/ocata/settings.py
@@ -90,15 +90,17 @@ CACHES = {
}
# [MSB]
+DEFAULT_MSB_PROTO = "http"
+MSB_SERVICE_PROTOCOL = os.environ.get('MSB_PROTO', DEFAULT_MSB_PROTO)
MSB_SERVICE_ADDR = os.environ.get('MSB_ADDR', "127.0.0.1")
MSB_SERVICE_PORT = os.environ.get('MSB_PORT', "80")
# [Multicloud]
-MULTICLOUD_PREFIX = "http://%s:%s/api/multicloud-ocata/v0" % (
- MSB_SERVICE_ADDR, MSB_SERVICE_PORT)
+MULTICLOUD_PREFIX = "%s://%s:%s/api/multicloud-ocata/v0" % (
+ MSB_SERVICE_PROTOCOL, MSB_SERVICE_ADDR, MSB_SERVICE_PORT)
-MULTICLOUD_API_V1_PREFIX = "http://%s:%s/api/multicloud-ocata/v1" % (
- MSB_SERVICE_ADDR, MSB_SERVICE_PORT)
+MULTICLOUD_API_V1_PREFIX = "%s://%s:%s/api/multicloud-ocata/v1" % (
+ MSB_SERVICE_PROTOCOL, MSB_SERVICE_ADDR, MSB_SERVICE_PORT)
# [A&AI]
AAI_ADDR = os.environ.get('AAI_ADDR', "aai.api.simpledemo.openecomp.org")