X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=plans%2Fdcaegen2-collectors-hv-ves%2Ftestsuites%2Fdocker-compose.yml;h=d89e82bb69b751b68c1158def0402a5da7e1803b;hb=ee72614cc6fe35737d24db1c99ceb13b7e5e54fd;hp=1d34e9f8634392b99e06e60f311502846c017f22;hpb=2201af3921058d168581b2a0d9c8ce276efecde6;p=integration%2Fcsit.git

diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
index 1d34e9f8..d89e82bb 100644
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
@@ -30,21 +30,39 @@ services:
   #
 
   zookeeper:
-    image: wurstmeister/zookeeper
+    image: ${ZOOKEEPER_IMAGE_FULL_NAME}
     ports:
       - "2181:2181"
     networks:
       - hv-ves-default
 
   kafka:
-    image: wurstmeister/kafka
+    image: ${KAFKA_IMAGE_FULL_NAME}
     ports:
       - "9092:9092"
+      - "9093:9093"
     environment:
-      KAFKA_ADVERTISED_HOST_NAME: "kafka"
-      KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true'
+      HOST_IP: 127.0.0.1
+      KAFKA_BROKER_ID: 0
+      ENDPOINT_PORT: 30490
       KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181"
-      KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://kafka:9092"
+      KAFKA_AUTO_CREATE_TOPICS_ENABLE: "true"
+      KAFKA_DELETE_TOPIC_ENABLE: "true"
+
+      KAFKA_LISTENERS: "INTERNAL_SASL_PLAINTEXT://0.0.0.0:9092,EXTERNAL_SASL_PLAINTEXT://0.0.0.0:9093"
+      KAFKA_ADVERTISED_LISTENERS: "INTERNAL_SASL_PLAINTEXT://:9092,EXTERNAL_SASL_PLAINTEXT://:9093"
+      KAFKA_ADVERTISED_HOST_NAME: "kafka"
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INTERNAL_SASL_PLAINTEXT:SASL_PLAINTEXT,EXTERNAL_SASL_PLAINTEXT:SASL_PLAINTEXT"
+      KAFKA_INTER_BROKER_LISTENER_NAME: "INTERNAL_SASL_PLAINTEXT"
+      KAFKA_SASL_ENABLED_MECHANISMS: "PLAIN"
+      KAFKA_SASL_MECHANISM_INTER_BROKER_PROTOCOL: "PLAIN"
+      KAFKA_AUTHORIZER_CLASS_NAME: "org.onap.dmaap.kafkaAuthorize.KafkaCustomAuthorizer"
+
+      aaf_locate_url: https://aaf-locate:8095
+      KAFKA_LOG_DIRS: /opt/kafka/data
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_DEFAULT_REPLICATION_FACTOR: 1
+      KAFKA_NUM_PARTITIONS: 1
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     depends_on:
@@ -66,7 +84,7 @@ services:
       - hv-ves-default
 
   config-binding-service:
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:2.2.4
+    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding:2.5.2
     ports:
       - "10000:10000"
     environment:
@@ -85,19 +103,20 @@ services:
     ports:
       - "6060:6060"
       - "6061:6061/tcp"
-    command: ["--configuration-file", "/etc/hv-ves/configuration/secure.json"]
+    command: ["--configuration-file", "/etc/ves-hv/configuration/secure.json"]
     environment:
       - JAVA_OPTS
       - HOSTNAME=${HV_VES_HOSTNAME}
       - CONSUL_HOST
       - CONFIG_BINDING_SERVICE
+      - CONFIG_BINDING_SERVICE_SERVICE_PORT
     healthcheck:
       interval: 10s
       timeout: 5s
       retries: 2
       test: ${HV_VES_HEALTHCHECK_CMD}
     volumes:
-      - ./collector/:/etc/hv-ves/
+      - ./collector/:/etc/ves-hv/
     depends_on:
       - config-binding-service
       - kafka
@@ -109,19 +128,20 @@ services:
     ports:
       - "7060:6060"
       - "7061:6061/tcp"
-    command: ["--configuration-file", "/etc/hv-ves/configuration/insecure.json"]
+    command: ["--configuration-file", "/etc/ves-hv/configuration/insecure.json"]
     environment:
       - JAVA_OPTS
       - HOSTNAME=${HV_VES_HOSTNAME}
       - CONSUL_HOST
       - CONFIG_BINDING_SERVICE
+      - CONFIG_BINDING_SERVICE_SERVICE_PORT
     healthcheck:
       interval: 10s
       timeout: 5s
       retries: 2
       test: ${HV_VES_HEALTHCHECK_CMD}
     volumes:
-      - ./collector/:/etc/hv-ves/
+      - ./collector/:/etc/ves-hv/
     depends_on:
       - config-binding-service
       - kafka