diff --git a/opencontrail/files/3.0/server.properties b/opencontrail/files/3.0/server.properties
index 091346c..5560f5c 100644
--- a/opencontrail/files/3.0/server.properties
+++ b/opencontrail/files/3.0/server.properties
@@ -63,7 +63,7 @@
 # The default number of log partitions per topic. More partitions allow greater
 # parallelism for consumption, but this will also result in more files across
 # the brokers.
-num.partitions=1
+num.partitions=30
 
 # The number of threads per data directory to be used for log recovery at startup and flushing at shutdown.
 # This value is recommended to be increased for installations with data dirs located in RAID array.
@@ -94,14 +94,14 @@
 # from the end of the log.
 
 # The minimum age of a log file to be eligible for deletion
-log.retention.hours=168
+log.retention.hours=24
 
 # A size-based retention policy for logs. Segments are pruned from the log as long as the remaining
 # segments don't drop below log.retention.bytes.
 #log.retention.bytes=1073741824
 
 # The maximum size of a log segment file. When this size is reached a new log segment will be created.
-log.segment.bytes=1073741824
+log.segment.bytes=268435456
 
 # The interval at which log segments are checked to see if they can be deleted according
 # to the retention policies
@@ -118,7 +118,10 @@
 zookeeper.connect={% for member in database.members %}{{ member.host }}:2181{% if not loop.last %},{% endif %}{% endfor %}
 
 # Timeout in ms for connecting to zookeeper
-log.cleanup.policy=compact
+log.cleanup.policy=delete
+log.cleaner.threads=2
+log.cleaner.dedupe.buffer.size=250000000
+
 delete.topic.enable=true
 
 default.replication.factor={% if database.members|length>1 %}2{% else %}1{% endif %}
diff --git a/opencontrail/files/4.0/contrail-alarm-gen.conf b/opencontrail/files/4.0/contrail-alarm-gen.conf
index bff7991..41d6690 100644
--- a/opencontrail/files/4.0/contrail-alarm-gen.conf
+++ b/opencontrail/files/4.0/contrail-alarm-gen.conf
@@ -5,11 +5,11 @@
 #http_server_port = 5995
 log_local = 1
 log_level = SYS_NOTICE
-#log_category = 
+#log_category =
 log_file = /var/log/contrail/contrail-alarm-gen.log
 kafka_broker_list = {% for member in collector.database.members %}{{ member.host }}:9092 {% endfor %}
 partitions=30
-zk_list = {% for member in collector.database.members %}{{ member.host }}:2181{% if not loop.last %},{% endif %}{% endfor %}
+zk_list = {% for member in collector.database.members %}{{ member.host }}:2181 {% endfor %}
 #rabbitmq_server_list = xx.xx.xx.xx
 rabbitmq_server_list = {{ collector.message_queue.host }}
 rabbitmq_port = 5672
@@ -20,8 +20,8 @@
 #api_server_use_ssl=False
 
 [REDIS]
-#redis_server_port=6379
-#redis_uve_list=ip1:6379 ip2:6379
+redis_server_port=6379
+redis_uve_list = {% for member in collector.database.members %}{{ member.host }}:6379 {% endfor %}
 
 [SANDESH]
 #sandesh_ssl_enable=False
diff --git a/opencontrail/files/4.0/contrail-analytics-api.conf b/opencontrail/files/4.0/contrail-analytics-api.conf
index f6f4004..1ee1f61 100644
--- a/opencontrail/files/4.0/contrail-analytics-api.conf
+++ b/opencontrail/files/4.0/contrail-analytics-api.conf
@@ -5,11 +5,12 @@
 cassandra_server_list={% for member in collector.database.members %}{{ member.host }}:9042 {% endfor %}
 http_server_port = 8090
 api_server={% for member in collector.config.members %}{{ member.host }}:9100 {% endfor %}
+zk_list={% for member in collector.database.members %}{{ member.host }}:2181 {% endfor %}
 rest_api_port = {{ collector.bind.get('port', '8081') }}
-rest_api_ip = 0.0.0.0 
+rest_api_ip = 0.0.0.0
 log_local = 1
 log_level = SYS_NOTICE
-log_category = 
+log_category =
 log_file = /var/log/contrail/contrail-analytics-api.log
 
 # Sandesh send rate limit can be used to throttle system logs transmitted per
@@ -30,10 +31,8 @@
 analytics_flow_ttl={{ collector.data_ttl }}
 
 [REDIS]
-#server=127.0.0.1
-redis_server_port = 6379
 redis_query_port = 6379
-#redis_uve_list = ip1:6379 ip2:6379
+redis_uve_list = {% for member in collector.database.members %}{{ member.host }}:6379 {% endfor %}
 
 [SANDESH]
 #sandesh_ssl_enable=False
diff --git a/opencontrail/files/4.0/server.properties b/opencontrail/files/4.0/server.properties
index 5cdaee6..a8ff61b 100644
--- a/opencontrail/files/4.0/server.properties
+++ b/opencontrail/files/4.0/server.properties
@@ -63,7 +63,7 @@
 # The default number of log partitions per topic. More partitions allow greater
 # parallelism for consumption, but this will also result in more files across
 # the brokers.
-num.partitions=1
+num.partitions=30
 
 # The number of threads per data directory to be used for log recovery at startup and flushing at shutdown.
 # This value is recommended to be increased for installations with data dirs located in RAID array.
@@ -94,14 +94,14 @@
 # from the end of the log.
 
 # The minimum age of a log file to be eligible for deletion
-log.retention.hours=168
+log.retention.hours=24
 
 # A size-based retention policy for logs. Segments are pruned from the log as long as the remaining
 # segments don't drop below log.retention.bytes.
 #log.retention.bytes=1073741824
 
 # The maximum size of a log segment file. When this size is reached a new log segment will be created.
-log.segment.bytes=1073741824
+log.segment.bytes=268435456
 
 # The interval at which log segments are checked to see if they can be deleted according
 # to the retention policies
@@ -118,5 +118,8 @@
 zookeeper.connect={% for member in database.members %}{{ member.host }}:2181{% if not loop.last %},{% endif %}{% endfor %}
 
 # Timeout in ms for connecting to zookeeper
-log.cleanup.policy=compact
+log.cleanup.policy=delete
+log.cleaner.threads=2
+log.cleaner.dedupe.buffer.size=250000000
+
 delete.topic.enable=true
diff --git a/opencontrail/files/findns b/opencontrail/files/findns
index 567fec5..212568a 100644
--- a/opencontrail/files/findns
+++ b/opencontrail/files/findns
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 exit_usage() {
-	echo "Usage: $0 <address>"
-	exit 1
+    echo "Usage: $0 <address>"
+    exit 1
 }
 
 [ -z $1 ] && exit_usage
@@ -10,9 +10,12 @@
 WC=$(ip netns | wc -l)
 for ((i=1;i<$WC+1;i++))
 do
-	NAMESPACE=$(ip netns | sed -n "$i"p)
-	if [ `ip netns exec $NAMESPACE ip a | grep $1 | wc -l` -gt 0 ]
-	then
- 		echo $NAMESPACE
-	fi
-done
\ No newline at end of file
+    NAMESPACE=$(ip netns | awk '{print $1}' | sed -n "$i"p)
+    if [ `ip netns exec $NAMESPACE ip a | grep $1 | wc -l` -gt 0 ]
+    then
+        STATE=backup
+        ip netns exec $NAMESPACE ping 8.8.8.8 -c 2 -W 1 > /dev/null && STATE=active
+        echo $NAMESPACE $STATE
+    fi
+done
+exit 0