diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2018-04-20 04:45:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-20 04:45:18 +0000 |
| commit | afdb47f8170613bf11f8d77aa4ea9e3b40357214 (patch) | |
| tree | 7e40cca956498ddcf71fab275e873803750dcea4 | |
| parent | 3ade57613f090a54e2444a8e7c426896ad6389dd (diff) | |
| parent | bf787b913bd7c5388282e1a0685d3f8de4f69bea (diff) | |
Merge "HPA enablement support AAI Schema v13 for TC"
| -rw-r--r-- | windriver/docker/Dockerfile | 4 | ||||
| -rw-r--r-- | windriver/titanium_cloud/settings.py | 2 |
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") |