summaryrefslogtreecommitdiffstats
path: root/test/csit/plans
diff options
context:
space:
mode:
authorVenkata Harish K Kajur <vk250x@att.com>2017-11-06 17:38:45 +0000
committerVenkata Harish K Kajur <vk250x@att.com>2017-11-06 17:40:29 +0000
commit70005767867cfa24d0183964178fd3993e8375fa (patch)
tree69e4992c390ea91eaef75caeb7181ca2fc8f1ca9 /test/csit/plans
parent7fbcfe9aa0c049c05aa9cd8bbf6c62796a1f109f (diff)
Update the haproxy to use latest aai certificate
Issue-ID: AAI-44 Change-Id: If3ca71b93c731cdf5c02f3ddd37438fb0d328e49 Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
Diffstat (limited to 'test/csit/plans')
-rw-r--r--test/csit/plans/aai/resources/docker-compose.yml2
-rw-r--r--test/csit/plans/aai/resources/setup.sh1
-rw-r--r--test/csit/plans/aai/traversal/docker-compose.yml2
-rw-r--r--test/csit/plans/aai/traversal/setup.sh1
4 files changed, 4 insertions, 2 deletions
diff --git a/test/csit/plans/aai/resources/docker-compose.yml b/test/csit/plans/aai/resources/docker-compose.yml
index 09d2a8127..e965e8cca 100644
--- a/test/csit/plans/aai/resources/docker-compose.yml
+++ b/test/csit/plans/aai/resources/docker-compose.yml
@@ -36,7 +36,7 @@ services:
max-size: "30m"
max-file: "5"
aai.api.simpledemo.openecomp.org:
- image: ${AAI_HAPROXY_IMAGE}
+ image: ${AAI_HAPROXY_IMAGE}:${HAPROXY_VERSION}
hostname: aai.api.simpledemo.openecomp.org
ports:
- 8443:8443
diff --git a/test/csit/plans/aai/resources/setup.sh b/test/csit/plans/aai/resources/setup.sh
index 19beb6365..42a766aa9 100644
--- a/test/csit/plans/aai/resources/setup.sh
+++ b/test/csit/plans/aai/resources/setup.sh
@@ -54,6 +54,7 @@ DOCKER_COMPOSE_CMD="docker-compose";
export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1);
export DOCKER_REGISTRY="nexus3.onap.org:10001";
export AAI_HAPROXY_IMAGE="${AAI_HAPROXY_IMAGE:-aaionap/haproxy}";
+export HAPROXY_VERSION="${HAPROXY_VERSION:-1.1.0}";
export HBASE_IMAGE="${HBASE_IMAGE:-aaionap/hbase}";
export HBASE_VERSION="${HBASE_VERSION:-1.2.0}";
diff --git a/test/csit/plans/aai/traversal/docker-compose.yml b/test/csit/plans/aai/traversal/docker-compose.yml
index 01dd4b481..7de07a63c 100644
--- a/test/csit/plans/aai/traversal/docker-compose.yml
+++ b/test/csit/plans/aai/traversal/docker-compose.yml
@@ -35,7 +35,7 @@ services:
max-size: "30m"
max-file: "5"
aai.api.simpledemo.openecomp.org:
- image: ${AAI_HAPROXY_IMAGE}
+ image: ${AAI_HAPROXY_IMAGE}:${HAPROXY_VERSION}
hostname: aai.api.simpledemo.openecomp.org
ports:
- 8443:8443
diff --git a/test/csit/plans/aai/traversal/setup.sh b/test/csit/plans/aai/traversal/setup.sh
index 010b0352e..5d58e6b80 100644
--- a/test/csit/plans/aai/traversal/setup.sh
+++ b/test/csit/plans/aai/traversal/setup.sh
@@ -54,6 +54,7 @@ DOCKER_COMPOSE_CMD="docker-compose";
export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1);
export DOCKER_REGISTRY="nexus3.onap.org:10001";
export AAI_HAPROXY_IMAGE="${AAI_HAPROXY_IMAGE:-aaionap/haproxy}";
+export HAPROXY_VERSION="${HAPROXY_VERSION:-1.1.0}";
export HBASE_IMAGE="${HBASE_IMAGE:-aaionap/hbase}";
export HBASE_VERSION="${HBASE_VERSION:-1.2.0}";