diff options
| author |   Yun Huang <yun.huang@windriver.com> | 2018-07-04 13:44:53 +0800 |
|---|---|---|
| committer | Yun Huang <yun.huang@windriver.com> | 2018-07-04 13:44:53 +0800 |
| commit | 94907dac70ffea23c2db762ffeb88b98a0c74372 (patch) | |
| tree | 0eb5bbe65ba7726e524e15f893424bf2658a045e | |
| parent | f79a9e0ac9a153559480456a42f2e6a10beeccf1 (diff) | |
Provide AAI_SERVICE_URL default value for TiCbeijing
In the MultiCloud HPA CSIT, the setup.sh script requires to control
the value of AAI_SERVICE_URL in order to avoid the use of certificates.
when AAI_SERVICE_URL not be set by CSIT, the system need to provide
a default value.
Change-Id: I78e2c26e97f1a20a03319ca9f7187cd6cf96d1c2
Issue-ID: MULTICLOUD-244
Signed-off-by: Yun Huang <yun.huang@windriver.com>
| -rw-r--r-- | windriver/docker/build_image.sh | 6 | ||||
| -rw-r--r-- | windriver/pom.xml | 2 | ||||
| -rw-r--r-- | windriver/titanium_cloud/settings.py | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/windriver/docker/build_image.sh b/windriver/docker/build_image.sh index 18a9dac9..0e4e57f3 100644 --- a/windriver/docker/build_image.sh +++ b/windriver/docker/build_image.sh @@ -6,8 +6,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.1.2-SNAPSHOT" -STAGING="1.1.2-STAGING" +VERSION="1.1.3-SNAPSHOT" +STAGING="1.1.3-STAGING" PROJECT="multicloud" IMAGE="openstack-windriver" DOCKER_REPOSITORY="nexus3.onap.org:10003" @@ -31,4 +31,4 @@ function push_image { } build_image -push_image
\ No newline at end of file +push_image diff --git a/windriver/pom.xml b/windriver/pom.xml index 0ee06581..d2ed1a15 100644 --- a/windriver/pom.xml +++ b/windriver/pom.xml @@ -24,7 +24,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.multicloud.openstack</groupId> <artifactId>multicloud-openstack-windriver</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.1.3-SNAPSHOT</version> <packaging>pom</packaging> <name>multicloud/openstack/windriver</name> <description>multicloud for openstack Wind River Titanium Cloud</description> diff --git a/windriver/titanium_cloud/settings.py b/windriver/titanium_cloud/settings.py index 296d8e75..64f0ab16 100644 --- a/windriver/titanium_cloud/settings.py +++ b/windriver/titanium_cloud/settings.py @@ -103,7 +103,11 @@ MULTICLOUD_PREFIX = "http://%s:%s/api/multicloud-titanium_cloud/v0" % ( # [A&AI] 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_SERVICE_URL = os.environ.get('AAI_SERVICE_URL', "") +if AAI_SERVICE_URL == "": + AAI_SERVICE_URL = 'https://%s:%s/aai' % (AAI_ADDR, AAI_PORT) + 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") |