fixes in analytics configuration
Change-Id: I7e890c78554ca4c92af68204446d12bad361da0c
diff --git a/opencontrail/files/3.0/contrail-analytics-api.conf b/opencontrail/files/3.0/contrail-analytics-api.conf
index 4a498b3..072b811 100644
--- a/opencontrail/files/3.0/contrail-analytics-api.conf
+++ b/opencontrail/files/3.0/contrail-analytics-api.conf
@@ -1,8 +1,7 @@
{%- from "opencontrail/map.jinja" import collector with context %}
[DEFAULTS]
host_ip = {{ collector.bind.address }}
-cassandra_server_list={% for member in collector.database.members %}{{ member.host }}:{{ member.port }} {% endfor %}
-collectors = {{ collector.bind.address }}:8086
+cassandra_server_list={% for member in collector.database.members %}{{ member.host }}:9042 {% endfor %}
http_server_port = 8090
rest_api_port = {{ collector.bind.get('port', '8081') }}
rest_api_ip = 0.0.0.0
diff --git a/opencontrail/files/3.0/contrail-api.conf b/opencontrail/files/3.0/contrail-api.conf
index ff92939..86aa8be 100644
--- a/opencontrail/files/3.0/contrail-api.conf
+++ b/opencontrail/files/3.0/contrail-api.conf
@@ -4,7 +4,7 @@
ifmap_server_port=8443
ifmap_username=api-server
ifmap_password=api-server
-cassandra_server_list={% for member in config.database.members %}{{ member.host }}:{{ member.port }} {% endfor %}
+cassandra_server_list={% for member in config.database.members %}{{ member.host }}:9160 {% endfor %}
listen_ip_addr=0.0.0.0
listen_port={{ config.bind.get('api_port', '8082') }}
multi_tenancy={{ config.get('multi_tenancy', 'true')|lower }}
diff --git a/opencontrail/files/3.0/contrail-device-manager.conf b/opencontrail/files/3.0/contrail-device-manager.conf
index 515179e..b60e43f 100644
--- a/opencontrail/files/3.0/contrail-device-manager.conf
+++ b/opencontrail/files/3.0/contrail-device-manager.conf
@@ -6,7 +6,7 @@
api_server_port=8082
zk_server_ip={% for member in config.database.members %}{{ member.host }}:2181{% if not loop.last %},{% endif %}{% endfor %}
log_file=/var/log/contrail/contrail-device-manager.log
-cassandra_server_list={% for member in config.database.members %}{{ member.host }}:{{ member.port }} {% endfor %}
+cassandra_server_list={% for member in config.database.members %}{{ member.host }}:9160 {% endfor %}
disc_server_ip={{ config.discovery.host }}
disc_server_port=5998
log_local=1
diff --git a/opencontrail/files/3.0/contrail-discovery.conf b/opencontrail/files/3.0/contrail-discovery.conf
index 3a4e100..18b84dd 100644
--- a/opencontrail/files/3.0/contrail-discovery.conf
+++ b/opencontrail/files/3.0/contrail-discovery.conf
@@ -6,7 +6,7 @@
listen_port={{ config.bind.get('discovery_port', '5998') }}
log_local=True
log_file=/var/log/contrail/discovery.log
-cassandra_server_list={% for member in config.database.members %}{{ member.host }}:{{ member.port }} {% endfor %}
+cassandra_server_list={% for member in config.database.members %}{{ member.host }}:9160 {% endfor %}
log_level=SYS_NOTICE
# minimim time to allow client to cache service information (seconds)
diff --git a/opencontrail/files/3.0/contrail-query-engine.conf b/opencontrail/files/3.0/contrail-query-engine.conf
index fc0e87f..e6a2504 100644
--- a/opencontrail/files/3.0/contrail-query-engine.conf
+++ b/opencontrail/files/3.0/contrail-query-engine.conf
@@ -7,7 +7,7 @@
[DEFAULT]
# analytics_data_ttl=48
-cassandra_server_list={% for member in collector.database.members %}{{ member.host }}:{{ member.port }} {% endfor %}
+cassandra_server_list={% for member in collector.database.members %}{{ member.host }}:9042 {% endfor %}
#collectors=127.0.0.1:8086
hostip={{ collector.bind.address }}
# hostname= # Retrieved as `hostname`
diff --git a/opencontrail/files/3.0/contrail-schema.conf b/opencontrail/files/3.0/contrail-schema.conf
index 9532ed6..23d7b6c 100644
--- a/opencontrail/files/3.0/contrail-schema.conf
+++ b/opencontrail/files/3.0/contrail-schema.conf
@@ -9,7 +9,7 @@
#zk_server_ip=10.0.102.31:2181,10.0.102.32:2181,10.0.102.33:2181
zk_server_ip={% for member in config.database.members %}{{ member.host }}:2181{% if not loop.last %},{% endif %}{% endfor %}
log_file=/var/log/contrail/contrail-schema.log
-cassandra_server_list={% for member in config.database.members %}{{ member.host }}:{{ member.port }} {% endfor %}
+cassandra_server_list={% for member in config.database.members %}{{ member.host }}:9160 {% endfor %}
disc_server_ip={{ config.discovery.host }}
disc_server_port=5998
log_local=1
diff --git a/opencontrail/files/3.0/contrail-svc-monitor.conf b/opencontrail/files/3.0/contrail-svc-monitor.conf
index 48898a9..dc756f0 100644
--- a/opencontrail/files/3.0/contrail-svc-monitor.conf
+++ b/opencontrail/files/3.0/contrail-svc-monitor.conf
@@ -10,7 +10,7 @@
#zk_server_ip=10.0.102.31:2181,10.0.102.32:2181,10.0.102.33:2181
zk_server_ip={% for member in config.database.members %}{{ member.host }}:2181{% if not loop.last %},{% endif %}{% endfor %}
log_file=/var/log/contrail/contrail-svc-monitor.log
-cassandra_server_list={% for member in config.database.members %}{{ member.host }}:{{ member.port }} {% endfor %}
+cassandra_server_list={% for member in config.database.members %}{{ member.host }}:9160 {% endfor %}
disc_server_ip={{ config.discovery.host }}
disc_server_port=5998
region_name=RegionOne