diff options
| author |   Yun Huang <yun.huang@windriver.com> | 2018-07-04 12:11:06 +0800 |
|---|---|---|
| committer | Yun Huang <yun.huang@windriver.com> | 2018-07-04 12:11:06 +0800 |
| commit | 1f4d7d30da9612fabd5ff0135ffe8f3d850c71e4 (patch) | |
| tree | 4a36e862445a00d47165dec1d20b299f1adb47ef | |
| parent | abd7f8cac14a6873b11d70b68d909819b46ab184 (diff) | |
Provide default value for AAI_SERVICE_URL
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: Ia9a778e73bae6634d37576ea140a7f7bc688adb1
Issue-ID: MULTICLOUD-244
Signed-off-by: Yun Huang <yun.huang@windriver.com>
| -rw-r--r-- | ocata/docker/build_image.sh | 4 | ||||
| -rw-r--r-- | ocata/ocata/settings.py | 6 | ||||
| -rw-r--r-- | ocata/pom.xml | 2 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | version.properties | 2 |
5 files changed, 10 insertions, 6 deletions
diff --git a/ocata/docker/build_image.sh b/ocata/docker/build_image.sh index 8e55f89f..80b1b704 100644 --- a/ocata/docker/build_image.sh +++ b/ocata/docker/build_image.sh @@ -5,8 +5,8 @@ echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}" cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" -VERSION="1.1.2-SNAPSHOT" -STAGING="1.1.2-STAGING" +VERSION="1.1.3-SNAPSHOT" +STAGING="1.1.3-STAGING" IMAGE_NAME="${DOCKER_REPOSITORY:-"nexus3.onap.org:10003"}/${ORG:-"onap"}/${PROJECT:-"multicloud"}/${IMAGE:-"openstack-ocata"}" if [ $HTTP_PROXY ]; then diff --git a/ocata/ocata/settings.py b/ocata/ocata/settings.py index 79344374..f9f040ba 100644 --- a/ocata/ocata/settings.py +++ b/ocata/ocata/settings.py @@ -100,7 +100,11 @@ MULTICLOUD_PREFIX = "http://%s:%s/api/multicloud-ocata/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 = os.environ.get('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/ocata/pom.xml b/ocata/pom.xml index 7ef3c588..368e9d5c 100644 --- a/ocata/pom.xml +++ b/ocata/pom.xml @@ -24,7 +24,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.multicloud.openstack</groupId> <artifactId>multicloud-openstack-ocata</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.1.3-SNAPSHOT</version> <packaging>pom</packaging> <name>multicloud/openstack/ocata</name> <description>multicloud for openstack ocata</description> @@ -26,7 +26,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.multicloud.openstack</groupId> <artifactId>multicloud-openstack-root</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.1.3-SNAPSHOT</version> <name>multicloud-openstack</name> <packaging>pom</packaging> <description>multicloud openstack</description> diff --git a/version.properties b/version.properties index d5a45f9e..7a91a502 100644 --- a/version.properties +++ b/version.properties @@ -18,7 +18,7 @@ major=1 minor=1 -patch=2 +patch=3 base_version=${major}.${minor}.${patch} |