diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2020-02-03 18:49:15 +0800 |
|---|---|---|
| committer | Bin Yang <bin.yang@windriver.com> | 2020-02-03 18:49:15 +0800 |
| commit | 74278035bbbb535274f74bb00c4e71eb4daf2fe2 (patch) | |
| tree | 25e08619e3191a084587a72676762b5dbff58baa /windriver | |
| parent | 5f8e9379af90e81ad4a4d27b8cf6afb6edb40569 (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 'windriver')
| -rw-r--r-- | windriver/docker/Dockerfile | 1 | ||||
| -rw-r--r-- | windriver/titanium_cloud/settings.py | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/windriver/docker/Dockerfile b/windriver/docker/Dockerfile index 909e13d3..4bde9d50 100644 --- a/windriver/docker/Dockerfile +++ b/windriver/docker/Dockerfile @@ -6,6 +6,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/windriver/titanium_cloud/settings.py b/windriver/titanium_cloud/settings.py index 4d51c11a..a4d7f631 100644 --- a/windriver/titanium_cloud/settings.py +++ b/windriver/titanium_cloud/settings.py @@ -81,7 +81,7 @@ TIME_ZONE = 'UTC' STATIC_URL = '/static/' - +DEFAULT_MSB_PROTO = "http" DEFAULT_MSB_ADDR = "127.0.0.1" DEFAULT_CACHE_BACKEND_LOCATION = '127.0.0.1:11211' @@ -93,15 +93,16 @@ CACHES = { } # [MSB] +MSB_SERVICE_PROTOCOL = os.environ.get('MSB_PROTO', DEFAULT_MSB_PROTO) MSB_SERVICE_ADDR = os.environ.get('MSB_ADDR', DEFAULT_MSB_ADDR) MSB_SERVICE_PORT = os.environ.get('MSB_PORT', "80") # [Multicloud] -MULTICLOUD_PREFIX = "http://%s:%s/api/multicloud-titaniumcloud/v0" % ( - MSB_SERVICE_ADDR, MSB_SERVICE_PORT) +MULTICLOUD_PREFIX = "%s://%s:%s/api/multicloud-titaniumcloud/v0" % ( + MSB_SERVICE_PROTOCOL, MSB_SERVICE_ADDR, MSB_SERVICE_PORT) -MULTICLOUD_API_V1_PREFIX = "http://%s:%s/api/multicloud-titaniumcloud/v1" % ( - MSB_SERVICE_ADDR, MSB_SERVICE_PORT) +MULTICLOUD_API_V1_PREFIX = "%s://%s:%s/api/multicloud-titaniumcloud/v1" % ( + MSB_SERVICE_PROTOCOL, MSB_SERVICE_ADDR, MSB_SERVICE_PORT) # [A&AI] AAI_ADDR = os.environ.get('AAI_ADDR', "aai.api.simpledemo.openecomp.org") |