Simplify consul/CBS configuration

[integration/csit.git] / plans / dcaegen2-collectors-hv-ves / testsuites / docker-compose.yml

diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
index 32b3943..4afd220 100644 (file)
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
@@ -34,7 +34,6 @@ services:
     networks:
       - ves-hv-default
 
-
   #
   # Consul / CBS
   #
@@ -43,13 +42,10 @@ services:
     image: docker.io/consul:1.0.6
     ports:
       - "8500:8500"
-    command: ["agent","-bootstrap", "-client=0.0.0.0", "-server", "-ui", "-config-dir=/consul/consul.d"]
     volumes:
-      - ./consul.d/:/consul/consul.d
+      - ./consul/:/consul/config
     networks:
-      ves-hv-default:
-        aliases:
-          - consul
+      - ves-hv-default
 
   config-binding-service:
     image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:2.2.4
@@ -60,9 +56,7 @@ services:
     depends_on:
       - consul-server
     networks:
-      ves-hv-default:
-        aliases:
-          - cbs
+      - ves-hv-default
 
   #
   # DCAE HV VES Collector