From f1ffdbc27f2cd05b487c7857362bf2018a513b21 Mon Sep 17 00:00:00 2001 From: Venkata Harish K Kajur Date: Tue, 12 Dec 2017 22:58:54 -0500 Subject: Update docker to use onap instead of openecomp This is causing issues since all of the aai repos have been udpated from using openecomp to using onap and also update the haproxy from using 1.1.0 to 1.2.0 for the hostname change from openecomp to onap Issue-ID: AAI-479 Change-Id: Ib05a383f3c353c8b9cf047bf87235ed0d1ca40b4 Signed-off-by: Venkata Harish K Kajur --- test/csit/plans/aai/traversal/docker-compose.yml | 26 +++++++++++------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'test/csit/plans/aai/traversal/docker-compose.yml') diff --git a/test/csit/plans/aai/traversal/docker-compose.yml b/test/csit/plans/aai/traversal/docker-compose.yml index 7de07a63c..8b07c336f 100644 --- a/test/csit/plans/aai/traversal/docker-compose.yml +++ b/test/csit/plans/aai/traversal/docker-compose.yml @@ -1,14 +1,13 @@ version: '2' services: - aai-resources.api.simpledemo.openecomp.org: - image: ${DOCKER_REGISTRY}/openecomp/aai-resources - hostname: aai-resources.api.simpledemo.openecomp.org + aai-resources.api.simpledemo.onap.org: + image: ${DOCKER_REGISTRY}/onap/aai-resources + hostname: aai-resources.api.simpledemo.onap.org environment: - AAI_CHEF_ENV=simpledemo - AAI_CHEF_LOC=/var/chef/aai-data/environments - CHEF_BRANCH=master - CHEF_GIT_URL=http://gerrit.onap.org/r/aai - - AAI_CORE_VERSION=1.1.0-SNAPSHOT - LOCAL_USER_ID=${USER_ID} ports: - 8447:8447 @@ -17,15 +16,14 @@ services: options: max-size: "30m" max-file: "5" - aai-traversal.api.simpledemo.openecomp.org: - image: ${DOCKER_REGISTRY}/openecomp/aai-traversal - hostname: aai-traversal.api.simpledemo.openecomp.org + aai-traversal.api.simpledemo.onap.org: + image: ${DOCKER_REGISTRY}/onap/aai-traversal + hostname: aai-traversal.api.simpledemo.onap.org environment: - AAI_CHEF_ENV=simpledemo - AAI_CHEF_LOC=/var/chef/aai-data/environments - CHEF_BRANCH=master - CHEF_GIT_URL=http://gerrit.onap.org/r/aai - - AAI_CORE_VERSION=1.1.0-SNAPSHOT - DISABLE_UPDATE_QUERY=true ports: - 8446:8446 @@ -34,14 +32,14 @@ services: options: max-size: "30m" max-file: "5" - aai.api.simpledemo.openecomp.org: + aai.api.simpledemo.onap.org: image: ${AAI_HAPROXY_IMAGE}:${HAPROXY_VERSION} - hostname: aai.api.simpledemo.openecomp.org + hostname: aai.api.simpledemo.onap.org ports: - 8443:8443 links: - - aai-resources.api.simpledemo.openecomp.org - - aai-traversal.api.simpledemo.openecomp.org + - aai-resources.api.simpledemo.onap.org + - aai-traversal.api.simpledemo.onap.org volumes: - /dev/log:/dev/log logging: @@ -49,9 +47,9 @@ services: options: max-size: "30m" max-file: "5" - aai.hbase.simpledemo.openecomp.org: + aai.hbase.simpledemo.onap.org: image: ${HBASE_IMAGE}:${HBASE_VERSION} - hostname: aai.hbase.simpledemo.openecomp.org + hostname: aai.hbase.simpledemo.onap.org ports: - 2181:2181 - 8080:8080 -- cgit 1.2.3-korg