From: Brian Freeman <bf1936@att.com>
Date: Thu, 22 Aug 2019 03:43:12 +0000 (+0000)
Subject: Merge "revert DMaaP ZooKeeper version to 6.0.0"
X-Git-Tag: 5.0.1-ONAP~131
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=72f26af12c2128ee03e80ba9178ecac0ea0a44b4;hp=86fe16201c5ce7682db873caeafbbb28f0f4dd0e;p=oom.git

Merge "revert DMaaP ZooKeeper version to 6.0.0"
---

diff --git a/kubernetes/dmaap/components/message-router/charts/message-router-kafka/resources/config/server.properties b/kubernetes/dmaap/components/message-router/charts/message-router-kafka/resources/config/server.properties
index 40469b741a..48341167f6 100644
--- a/kubernetes/dmaap/components/message-router/charts/message-router-kafka/resources/config/server.properties
+++ b/kubernetes/dmaap/components/message-router/charts/message-router-kafka/resources/config/server.properties
@@ -20,6 +20,11 @@ num.io.threads=8
 # The send buffer (SO_SNDBUF) used by the socket server
 socket.send.buffer.bytes=102400
 
+#The number of hours to keep a log file before deleting it
+log.retention.hours=168
+#The maximum size of the log before deleting it
+log.retention.bytes=21474836480
+
 # The receive buffer (SO_RCVBUF) used by the socket server
 socket.receive.buffer.bytes=102400
 
diff --git a/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/values.yaml b/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/values.yaml
index 9c72958cf9..4c5541bf2e 100644
--- a/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/values.yaml
+++ b/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/values.yaml
@@ -30,7 +30,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/dmaap/zookeeper:6.0.1
+image: onap/dmaap/zookeeper:6.0.0
 pullPolicy: Always
 ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
 busyBoxImage: busybox:1.30