Merge message-router chart under dmaap

[oom.git] / kubernetes / dmaap / charts / message-router / resources / config / dmaap / MsgRtrApi.properties

diff --git a/kubernetes/message-router/resources/config/dmaap/MsgRtrApi.properties b/kubernetes/dmaap/charts/message-router/resources/config/dmaap/MsgRtrApi.properties
similarity index 92%
rename from kubernetes/message-router/resources/config/dmaap/MsgRtrApi.properties
rename to kubernetes/dmaap/charts/message-router/resources/config/dmaap/MsgRtrApi.properties
index ed3999d..4015e94 100755 (executable)
--- a/kubernetes/message-router/resources/config/dmaap/MsgRtrApi.properties
+++ b/kubernetes/dmaap/charts/message-router/resources/config/dmaap/MsgRtrApi.properties
@@ -29,11 +29,7 @@
 ##
 ##     Both Cambria and Kafka make use of Zookeeper.
 ##
-config.zk.servers={{.Values.zookeeper.nameOverride}}:{{.Values.config.zookeeperPort}}
-#config.zk.servers=172.17.0.1:2181
-#dmaap.onap-message-router:2181
-#10.208.128.229:2181
-#config.zk.root=/fe3c/cambria/config
+config.zk.servers={{.Values.zookeeper.name}}:{{.Values.zookeeper.port}}
 
 
 ###############################################################################
@@ -43,11 +39,7 @@ config.zk.servers={{.Values.zookeeper.nameOverride}}:{{.Values.config.zookeeperP
 ##     Items below are passed through to Kafka's producer and consumer
 ##     configurations (after removing "kafka.")
 ##     if you want to change request.required.acks it can take this one value
-#kafka.metadata.broker.list=localhost:9092,localhost:9093
-kafka.metadata.broker.list={{.Values.kafka.nameOverride}}:{{.Values.config.kafkaPort}}
-#kafka.metadata.broker.list=172.17.0.1:9092
-#dmaap.onap-message-router:9092
-#10.208.128.229:9092
+kafka.metadata.broker.list={{.Values.kafka.name}}:{{.Values.kafka.port}}
 ##kafka.request.required.acks=-1
 #kafka.client.zookeeper=${config.zk.servers}
 consumer.timeout.ms=100