Switch to DMaaP kafka image

[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 ac07eb7..eb61db9 100644 (file)
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
@@ -1,7 +1,25 @@
 version: "3"
+# ============LICENSE_START=======================================================
+# csit-dcaegen2-collectors-hv-ves
+# ================================================================================
+# Copyright (C) 2018-2019 NOKIA
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+
 
 networks:
-  ves-hv-default:
+  hv-ves-default:
     external:
       name: $CONTAINERS_NETWORK
 
@@ -12,28 +30,45 @@ services:
   #
 
   zookeeper:
-    image: wurstmeister/zookeeper
+    image: ${ZOOKEEPER_IMAGE_FULL_NAME}
     ports:
       - "2181:2181"
     networks:
-      - ves-hv-default
+      - 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:
       - zookeeper
     networks:
-      - ves-hv-default
-
+      - hv-ves-default
 
   #
   # Consul / CBS
@@ -43,82 +78,73 @@ 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
+      - hv-ves-default
 
   config-binding-service:
     image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:2.2.4
     ports:
       - "10000:10000"
     environment:
-      CONSUL_HOST: "consul-server"
+      - CONSUL_HOST
     depends_on:
       - consul-server
     networks:
-      ves-hv-default:
-        aliases:
-          - cbs
+      - hv-ves-default
+
   #
   # DCAE HV VES Collector
   #
 
-  ves-hv-collector:
+  hv-ves-collector:
     image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${HV_VES_IMAGE}:${HV_VES_VERSION}
     ports:
       - "6060:6060"
       - "6061:6061/tcp"
-    command: ["--listen-port", "6061",
-              "--kafka-bootstrap-servers", "kafka:9092",
-              "--key-store-password", "onaponap",
-              "--trust-store-password", "onaponap"]
+    command: ["--configuration-file", "/etc/hv-ves/configuration/secure.json"]
     environment:
-      JAVA_OPTS: "-Dio.netty.leakDetection.level=paranoid"
-      CONSUL_HOST: "consul-server"
-      CONFIG_BINDING_SERVICE: "cbs"
-      HOSTNAME: "dcae-hv-ves-collector"
+      - JAVA_OPTS
+      - HOSTNAME=${HV_VES_HOSTNAME}
+      - CONSUL_HOST
+      - CONFIG_BINDING_SERVICE
     healthcheck:
       interval: 10s
       timeout: 5s
       retries: 2
       test: ${HV_VES_HEALTHCHECK_CMD}
     volumes:
-      - ./ssl/:/etc/ves-hv/
+      - ./collector/:/etc/hv-ves/
     depends_on:
       - config-binding-service
       - kafka
     networks:
-      - ves-hv-default
+      - hv-ves-default
 
-  unencrypted-ves-hv-collector:
+  unencrypted-hv-ves-collector:
     image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${HV_VES_IMAGE}:${HV_VES_VERSION}
     ports:
       - "7060:6060"
       - "7061:6061/tcp"
-    command: ["--listen-port", "6061",
-              "--kafka-bootstrap-servers", "kafka:9092",
-              "--ssl-disable"]
+    command: ["--configuration-file", "/etc/hv-ves/configuration/insecure.json"]
     environment:
-      JAVA_OPTS: "-Dio.netty.leakDetection.level=paranoid"
-      CONSUL_HOST: "consul-server"
-      CONFIG_BINDING_SERVICE: "cbs"
-      HOSTNAME: "dcae-hv-ves-collector"
+      - JAVA_OPTS
+      - HOSTNAME=${HV_VES_HOSTNAME}
+      - CONSUL_HOST
+      - CONFIG_BINDING_SERVICE
     healthcheck:
       interval: 10s
       timeout: 5s
       retries: 2
       test: ${HV_VES_HEALTHCHECK_CMD}
     volumes:
-      - ./ssl/:/etc/ves-hv/
+      - ./collector/:/etc/hv-ves/
     depends_on:
       - config-binding-service
       - kafka
     networks:
-      - ves-hv-default
+      - hv-ves-default
 
   dcae-app-simulator:
     image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${DCAE_APP_SIMULATOR_IMAGE}:${HV_VES_VERSION}
@@ -133,7 +159,5 @@ services:
     depends_on:
       - kafka
     networks:
-      ves-hv-default:
-        aliases:
-          - dcae-app-simulator
+      - hv-ves-default