Analytics in 4.0 requires zk_list and redis_uve_list
Change-Id: Ic55bacc8abc2cd94e47b21825585f3c7801a2f34
Signed-off-by: Illia Polliul <ipolliul@mirantis.com>
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