aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/dmaap/components/message-router/resources
diff options
context:
space:
mode:
authorsu622b <su622b@att.com>2019-08-16 03:50:57 -0400
committersunil unnava <su622b@att.com>2019-08-16 08:10:29 +0000
commit97c8c03034e800a5487077ed9552f9e4b6753691 (patch)
treedcd2303e36d7643c7403bfa8bf2a22485e1b0047 /kubernetes/dmaap/components/message-router/resources
parentb105b3dd34a46a2c3275f09640ec771e4077287b (diff)
DMaaP MR fixes
evert Kafka Docker image to onap/dmaap/kafka111:1.0.1 Changes related to AAF image changes Fix the logback.xml errors Enhancements to ZooKeeper ensemble and Kafka cluster lookup Issue-ID: DMAAP-1272 Change-Id: I53e9cff94c9ccf83f82383fe865f31d16f5416bc Signed-off-by: su622b <su622b@att.com>
Diffstat (limited to 'kubernetes/dmaap/components/message-router/resources')
-rwxr-xr-xkubernetes/dmaap/components/message-router/resources/config/dmaap/MsgRtrApi.properties7
-rwxr-xr-xkubernetes/dmaap/components/message-router/resources/config/dmaap/cadi.properties4
-rw-r--r--kubernetes/dmaap/components/message-router/resources/config/dmaap/logback.xml2
3 files changed, 8 insertions, 5 deletions
diff --git a/kubernetes/dmaap/components/message-router/resources/config/dmaap/MsgRtrApi.properties b/kubernetes/dmaap/components/message-router/resources/config/dmaap/MsgRtrApi.properties
index 8e446610d4..b07eaad9b5 100755
--- a/kubernetes/dmaap/components/message-router/resources/config/dmaap/MsgRtrApi.properties
+++ b/kubernetes/dmaap/components/message-router/resources/config/dmaap/MsgRtrApi.properties
@@ -36,7 +36,9 @@
## Both Cambria and Kafka make use of Zookeeper.
##
#config.zk.servers=172.18.1.1
-config.zk.servers={{.Values.zookeeper.name}}:{{.Values.zookeeper.port}}
+#config.zk.servers={{.Values.zookeeper.name}}:{{.Values.zookeeper.port}}
+config.zk.servers={{.Release.Name}}-{{.Values.zookeeper.name}}-0.{{.Values.zookeeper.name}}.{{.Release.Namespace}}.svc.cluster.local:{{.Values.zookeeper.port}},{{.Release.Name}}-{{.Values.zookeeper.name}}-1.{{.Values.zookeeper.name}}.{{.Release.Namespace}}.svc.cluster.local:{{.Values.zookeeper.port}},{{.Release.Name}}-{{.Values.zookeeper.name}}-2.{{.Values.zookeeper.name}}.{{.Release.Namespace}}.svc.cluster.local:{{.Values.zookeeper.port}}
+
#config.zk.root=/fe3c/cambria/config
@@ -48,7 +50,8 @@ config.zk.servers={{.Values.zookeeper.name}}:{{.Values.zookeeper.port}}
## 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.name}}:{{.Values.kafka.port}}
+#kafka.metadata.broker.list={{.Values.kafka.name}}:{{.Values.kafka.port}}
+kafka.metadata.broker.list={{.Release.Name}}-{{.Values.kafka.name}}-0.{{.Values.kafka.name}}.{{.Release.Namespace}}.svc.cluster.local:{{.Values.kafka.port}},{{.Release.Name}}-{{.Values.kafka.name}}-1.{{.Values.kafka.name}}.{{.Release.Namespace}}.svc.cluster.local:{{.Values.kafka.port}},{{.Release.Name}}-{{.Values.kafka.name}}-2.{{.Values.kafka.name}}.{{.Release.Namespace}}.svc.cluster.local:{{.Values.kafka.port}}
##kafka.request.required.acks=-1
#kafka.client.zookeeper=${config.zk.servers}
consumer.timeout.ms=100
diff --git a/kubernetes/dmaap/components/message-router/resources/config/dmaap/cadi.properties b/kubernetes/dmaap/components/message-router/resources/config/dmaap/cadi.properties
index 4e0b085e20..36dafce986 100755
--- a/kubernetes/dmaap/components/message-router/resources/config/dmaap/cadi.properties
+++ b/kubernetes/dmaap/components/message-router/resources/config/dmaap/cadi.properties
@@ -1,5 +1,5 @@
-aaf_locate_url=https://aaf-locate:8095
-aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.1
+aaf_locate_url=https://aaf-locate.{{ include "common.namespace" . }}:8095
+aaf_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.service:2.1
aaf_env=DEV
aaf_lur=org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm
diff --git a/kubernetes/dmaap/components/message-router/resources/config/dmaap/logback.xml b/kubernetes/dmaap/components/message-router/resources/config/dmaap/logback.xml
index 75379541e1..5dac1c0de7 100644
--- a/kubernetes/dmaap/components/message-router/resources/config/dmaap/logback.xml
+++ b/kubernetes/dmaap/components/message-router/resources/config/dmaap/logback.xml
@@ -40,7 +40,7 @@
</filter>
</appender>
- <appender name="DEBUG"
+ <appender name="DEBUG" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>