Fix NPE when getting Consul configuration

[dcaegen2/collectors/hv-ves.git] / docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index af8e0e0..f0713c7 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,36 +1,67 @@
 version: "2"
 services:
+
   zookeeper:
     image: wurstmeister/zookeeper
     ports:
       - "2181:2181"
+
   kafka:
     image: wurstmeister/kafka
     ports:
       - "9092:9092"
     environment:
-      HOSTNAME_COMMAND: "route -n | awk '/UG[ \t]/{print $$2}'"
+      KAFKA_ADVERTISED_HOST_NAME: "kafka"
       KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true'
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181"
+      KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://kafka:9092"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     depends_on:
       - zookeeper
-  hv-collector:
-    build:
-      context: hv-collector-main
-      dockerfile: Dockerfile
+
+  consul:
+      image: progrium/consul
+      ports:
+        - "8500:8500"
+      environment:
+        - CONSUL_BIND_INTERFACE=eth0
+      command: ["-server", "-bootstrap", "-ui-dir", "/ui"]
+
+  ves-hv-collector:
+    image: onap/ves-hv-collector
+#    build:
+#      context: hv-collector-main
+#      dockerfile: Dockerfile
     ports:
       - "6061:6061/tcp"
+    command: ["--listen-port", "6061","--config-url", "http://consul:8500/v1/kv/veshv-config"]
     depends_on:
       - kafka
+      - consul
     volumes:
       - ./ssl/:/etc/ves-hv/
+
   xnf-simulator:
-    build:
-      context: hv-collector-client-simulator
-      dockerfile: Dockerfile
+    image: onap/ves-hv-collector-xnf-simulator
+#    build:
+#      context: hv-collector-xnf-simulator
+#      dockerfile: Dockerfile
+    ports:
+      - "6062:6062/tcp"
+    command: ["--listen-port", "6062", "--ves-host", "ves-hv-collector", "--ves-port", "6061"]
     depends_on:
-      - hv-collector
+      - ves-hv-collector
     volumes:
-      - ./ssl/:/etc/ves-hv/
\ No newline at end of file
+      - ./ssl/:/etc/ves-hv/
+
+  dcae-app-simulator:
+    image: onap/ves-hv-collector-dcae-simulator
+#    build:
+#      context: hv-collector-dcae-app-simulator
+#      dockerfile: Dockerfile
+    ports:
+      - "6063:6063/tcp"
+    command: ["--listen-port", "6063", "--kafka-bootstrap-servers", "kafka:9092", "--kafka-topics", "ves_hvRanMeas"]
+    depends_on:
+      - kafka