X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=demo%2Fdocker_files%2F__docker-compose.yml;h=6c56c88084a41f1c826dd0a5af2398decc0ad7ea;hb=bceef1dec8787b376927c0d05939fc2ba3948e4f;hp=1983ed713fb445ed56f1b4396e1ee48c92d87cf4;hpb=61986ce57b32cb8ca7766c5207d34bd3c9b6595a;p=dmaap%2Fmessagerouter%2Fmessageservice.git

diff --git a/demo/docker_files/__docker-compose.yml b/demo/docker_files/__docker-compose.yml
index 1983ed7..6c56c88 100644
--- a/demo/docker_files/__docker-compose.yml
+++ b/demo/docker_files/__docker-compose.yml
@@ -18,16 +18,28 @@ services:
         max-file: "5"
 
   kafka:
-    build:
-      context: .
-      dockerfile: Dockerfile-local
+    #CADI integrated kafka image
+    #image: nexus3.onap.org:10001/onap/dmaap/kafka01101:0.0.2
+    image: nexus3.onap.org:10001/onap/dmaap/kafka01101:0.0.1
     ports:
       - "9092:9092"
     environment:
-      #KAFKA_ADVERTISED_HOST_NAME: {{ ip.docker0 }}
-      KAFKA_ADVERTISED_HOST_NAME: kafka
+      enableCadi: 'false'
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_BROKER_ID: 1
+      #Properties required for using the CADI integrated Kafka
+      #KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INTERNAL_SASL_PLAINTEXT:SASL_PLAINTEXT,EXTERNAL_SASL_PLAINTEXT:SASL_PLAINTEXT
+      #KAFKA_ADVERTISED_LISTENERS: INTERNAL_SASL_PLAINTEXT://kafka:9092
+      #KAFKA_LISTENERS: INTERNAL_SASL_PLAINTEXT://0.0.0.0:9092
+      #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-onap-test.osaaf.org:8095
+      #Remove the below 4 properties if CADI
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INTERNAL_PLAINTEXT:PLAINTEXT,EXTERNAL_PLAINTEXT:PLAINTEXT
+      KAFKA_ADVERTISED_LISTENERS: INTERNAL_PLAINTEXT://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
       - ./data-kafka:/kafka
@@ -37,9 +49,11 @@ services:
       options:
         max-size: "30m"
         max-file: "5"
-      
+
   dmaap:
-    image: onap/dmaap/dmaap-mr:1.1.4
+    #CADI integrated MR image
+    #image: ${NEXUS_DOCKER_REPO}/onap/dmaap/dmaap-mr:1.1.7
+    image: ${NEXUS_DOCKER_REPO}/onap/dmaap/dmaap-mr:1.1.6
     ports:
       - "3904:3904"
       - "3905:3905"