X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fdocker-compose%2Fdocker-compose.yml;h=40a183e867df38dd65c2aa8e914fe0087c22b2ea;hb=80d6c640248271da46157fd3189f72b20596ea1b;hp=40f6beadf4152d61008159ded46aaa16a71b397f;hpb=0643517a9fd0d4d23ebef740e2b3cc18f41c9318;p=dmaap%2Fmessagerouter%2Fmessageservice.git

diff --git a/src/main/resources/docker-compose/docker-compose.yml b/src/main/resources/docker-compose/docker-compose.yml
index 40f6bea..40a183e 100644
--- a/src/main/resources/docker-compose/docker-compose.yml
+++ b/src/main/resources/docker-compose/docker-compose.yml
@@ -6,19 +6,37 @@ services:
       - "2181:2181"
 
   kafka:
-   image: wurstmeister/kafka:0.8.1.1-1
+   #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:
-    HOSTNAME_COMMAND: "hostname -i"
+    enableCadi: false
     KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+    #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 is enabled
+    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
    depends_on:
     - zookeeper
 
   dmaap:
-    image: nexus3.onap.org:10001/onap/dmaap/dmaap-mr
+    #CADI integrated MR image
+    #image: ${NEXUS_DOCKER_REPO}/onap/dmaap/dmaap-mr:1.1.7
+    image: nexus3.onap.org:10001/onap/dmaap/dmaap-mr:1.1.6
     ports:
       - "3904:3904"
       - "3905:3905"