summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYun Huang <yun.huang@windriver.com>2018-04-20 11:14:00 +0800
committerYun Huang <yun.huang@windriver.com>2018-04-20 11:14:00 +0800
commitbf787b913bd7c5388282e1a0685d3f8de4f69bea (patch)
tree712c744372051d3ffcc7a2bf99b06d2114700cca
parent2213d20964890593e2e72d2c827e4c6a827c4e69 (diff)
HPA enablement support AAI Schema v13 for TC
Change-Id: I4ff9536b16de32b9dfab6d1e03d8f1098f2651e3 Issue-ID: MULTICLOUD-179 Signed-off-by: Yun Huang <yun.huang@windriver.com>
-rw-r--r--windriver/docker/Dockerfile4
-rw-r--r--windriver/titanium_cloud/settings.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/windriver/docker/Dockerfile b/windriver/docker/Dockerfile
index ac2e62ef..82e669e0 100644
--- a/windriver/docker/Dockerfile
+++ b/windriver/docker/Dockerfile
@@ -10,7 +10,7 @@ ENV MSB_ADDR "127.0.0.1"
ENV MSB_PORT "80"
ENV AAI_ADDR "aai.api.simpledemo.openecomp.org"
ENV AAI_PORT "8443"
-ENV AAI_SCHEMA_VERSION "v11"
+ENV AAI_SCHEMA_VERSION "v13"
ENV AAI_USERNAME "AAI"
ENV AAI_PASSWORD "AAI"
@@ -28,4 +28,4 @@ RUN apt-get update && \
pip install -r /opt/windriver/requirements.txt
WORKDIR /opt/windriver
-CMD /bin/sh -c /opt/windriver/run.sh \ No newline at end of file
+CMD /bin/sh -c /opt/windriver/run.sh
diff --git a/windriver/titanium_cloud/settings.py b/windriver/titanium_cloud/settings.py
index c3da724f..296d8e75 100644
--- a/windriver/titanium_cloud/settings.py
+++ b/windriver/titanium_cloud/settings.py
@@ -104,7 +104,7 @@ MULTICLOUD_PREFIX = "http://%s:%s/api/multicloud-titanium_cloud/v0" % (
AAI_ADDR = os.environ.get('AAI_ADDR', "aai.api.simpledemo.openecomp.org")
AAI_PORT = os.environ.get('AAI_PORT', "8443")
AAI_SERVICE_URL = 'https://%s:%s/aai' % (AAI_ADDR, AAI_PORT)
-AAI_SCHEMA_VERSION = os.environ.get('AAI_SCHEMA_VERSION', "v11")
+AAI_SCHEMA_VERSION = os.environ.get('AAI_SCHEMA_VERSION', "v13")
AAI_USERNAME = os.environ.get('AAI_USERNAME', "AAI")
AAI_PASSWORD = os.environ.get('AAI_PASSWORD', "AAI")