diff options
Diffstat (limited to 'ocata')
| -rw-r--r-- | ocata/docker/Dockerfile | 1 | ||||
| -rw-r--r-- | ocata/ocata/settings.py | 10 |
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") |