summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--newton/docker/build_image.sh4
-rw-r--r--newton/newton/settings.py6
-rw-r--r--newton/pom.xml2
3 files changed, 8 insertions, 4 deletions
diff --git a/newton/docker/build_image.sh b/newton/docker/build_image.sh
index 7b8401eb..3b2cb91a 100644
--- a/newton/docker/build_image.sh
+++ b/newton/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-newton"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/newton/newton/settings.py b/newton/newton/settings.py
index 2e004f1f..5263c795 100644
--- a/newton/newton/settings.py
+++ b/newton/newton/settings.py
@@ -107,7 +107,11 @@ MULTICLOUD_PREFIX = "http://%s:%s/api/multicloud-newton/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")
diff --git a/newton/pom.xml b/newton/pom.xml
index 1d23ad16..5d9f784f 100644
--- a/newton/pom.xml
+++ b/newton/pom.xml
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.multicloud.openstack</groupId>
<artifactId>multicloud-openstack-newton</artifactId>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>multicloud/openstack/newton</name>
<description>multicloud for openstack newton</description>