diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2017-11-06 21:25:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-11-06 21:25:39 +0000 |
| commit | 9de9242fe38465e515f83c2826fdc55acc3901d4 (patch) | |
| tree | e1133f780f8879a1b285b3ebd4d76ad39e6fe060 /test/csit/plans/aai | |
| parent | 4bf43cdf090f55d1f145751e4bbbd6a86028a8cd (diff) | |
| parent | 70005767867cfa24d0183964178fd3993e8375fa (diff) | |
Merge "Update the haproxy to use latest aai certificate"
Diffstat (limited to 'test/csit/plans/aai')
| -rw-r--r-- | test/csit/plans/aai/resources/docker-compose.yml | 2 | ||||
| -rw-r--r-- | test/csit/plans/aai/resources/setup.sh | 1 | ||||
| -rw-r--r-- | test/csit/plans/aai/traversal/docker-compose.yml | 2 | ||||
| -rw-r--r-- | test/csit/plans/aai/traversal/setup.sh | 1 |
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}"; |