summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--windriver/docker/build_image.sh6
-rw-r--r--windriver/pom.xml2
-rw-r--r--windriver/titanium_cloud/settings.py6
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")