1 files changed, 63 insertions, 36 deletions

diff --git a/docker-compose.yml b/docker-compose.yml
index 4015b08b..d4c3f1d8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,45 +1,73 @@
 version: "3.5"
 services:
-  zookeeper:
+
+  #
+  # DMaaP Message Router
+  #
+
+  message-router-zookeeper:
     image: wurstmeister/zookeeper
     ports:
-      - "2181:2181"
+    - "2181:2181"
 
-  kafka:
+  message-router-kafka:
+#    image: nexus3.onap.org:10001/onap/dmaap/kafka01101:0.0.1
     image: wurstmeister/kafka
     ports:
-      - "9092:9092"
+    - "9092:9092"
     environment:
-      KAFKA_ADVERTISED_HOST_NAME: "kafka"
       KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true'
-      KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181"
-      KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://kafka:9092"
+      KAFKA_ZOOKEEPER_CONNECT: "message-router-zookeeper:2181"
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INTERNAL_PLAINTEXT:PLAINTEXT,EXTERNAL_PLAINTEXT:PLAINTEXT"
+      KAFKA_ADVERTISED_LISTENERS: "INTERNAL_PLAINTEXT://message-router-kafka:9092"
+      KAFKA_LISTENERS: "INTERNAL_PLAINTEXT://0.0.0.0:9092"
+      KAFKA_INTER_BROKER_LISTENER_NAME: "INTERNAL_PLAINTEXT"
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
+    - /var/run/docker.sock:/var/run/docker.sock
+    depends_on:
+    - message-router-zookeeper
+
+
+  #
+  # Consul / CBS
+  #
+
+  consul-server:
+    image: docker.io/consul:1.0.6
+    ports:
+    - "8500:8500"
+    command: ["agent","-bootstrap", "-client=0.0.0.0", "-server", "-ui"]
+
+  consul-config:
+    image: consul
     depends_on:
-      - zookeeper
+    - consul-server
+    restart: on-failure
+    command: ["kv", "put", "-http-addr=http://consul-server:8500", "veshv-config", '{
+                                              "dmaap.kafkaBootstrapServers": "message-router-kafka:9092",
+                                              "collector.routing": [
+                                                {
+                                                  "fromDomain": "perf3gpp",
+                                                  "toTopic": "HV_VES_PERF3GPP"
+                                                }
+                                              ]
+                                            }']
+
 
-  consul:
-      image: progrium/consul
-      ports:
-        - "8500:8500"
-      environment:
-        - CONSUL_BIND_INTERFACE=eth0
-      command: ["-server", "-bootstrap", "-ui-dir", "/ui"]
+  #
+  # DCAE HV VES Collector
+  #
 
   ves-hv-collector:
     image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:latest
-#    build:
-#      context: hv-collector-main
-#      dockerfile: Dockerfile
     ports:
-      - "6060:6060"
-      - "6061:6061/tcp"
+    - "6060:6060"
+    - "6061:6061/tcp"
     entrypoint: ["java", "-Dio.netty.leakDetection.level=paranoid",
                  "-cp", "*:", "org.onap.dcae.collectors.veshv.main.MainKt"]
     command: ["--listen-port", "6061",
               "--health-check-api-port", "6060",
-              "--config-url", "http://consul:8500/v1/kv/veshv-config?raw=true",
+              "--config-url", "http://consul-server:8500/v1/kv/veshv-config?raw=true",
               "--key-store-password", "onaponap",
               "--trust-store-password", "onaponap"]
     healthcheck:
@@ -49,37 +77,36 @@ services:
       retries: 3
       start_period: 20s
     depends_on:
-      - kafka
-      - consul
+    - message-router-kafka
+    - consul-server
     volumes:
-      - ./ssl/:/etc/ves-hv/
+    - ./ssl/:/etc/ves-hv/
+
+
+  #
+  # Simulators
+  #
 
   xnf-simulator:
     image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-xnf-simulator
-#    build:
-#      context: hv-collector-xnf-simulator
-#      dockerfile: Dockerfile
     ports:
-      - "6062:6062/tcp"
+    - "6062:6062/tcp"
     command: ["--listen-port", "6062",
               "--ves-host", "ves-hv-collector",
               "--ves-port", "6061",
               "--key-store-password", "onaponap",
               "--trust-store-password", "onaponap"]
     depends_on:
-      - ves-hv-collector
+    - ves-hv-collector
     volumes:
       - ./ssl/:/etc/ves-hv/
 
   dcae-app-simulator:
     image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-dcae-app-simulator
-#    build:
-#      context: hv-collector-dcae-app-simulator
-#      dockerfile: Dockerfile
     ports:
-      - "6063:6063/tcp"
+    - "6063:6063/tcp"
     command: ["--listen-port", "6063",
-              "--kafka-bootstrap-servers", "kafka:9092",
+              "--kafka-bootstrap-servers", "message-router-kafka:9092",
               "--kafka-topics", "HV_VES_PERF3GPP"]
     depends_on:
-      - kafka
+    - message-router-kafka