diff options
| author |   chenshuai@huawei.com <chenshuai@huawei.com> | 2016-01-19 21:33:41 +0800 |
|---|---|---|
| committer | shuai chen <chenshuai@huawei.com> | 2016-01-21 14:50:10 +0000 |
| commit | 49969489169623beeb31d19f6a8a167a67c69417 (patch) | |
| tree | d23874cf253747609f38fccf74d1ce769437b175 /deploy/adapters/ansible/roles/open-contrail/templates/provision | |
| parent | d81783305d2837eb2d76f8f3098bd06f2b58a5d2 (diff) | |
bugfix: opencontrail contrail-snmp-collector configuration error
JIRA: COMPASS-280
Change-Id: I51cf44fdf36aa7665ffb7ab04942fb41cefa0027
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
(cherry picked from commit d15a9e4a62822af5347bba1f61c41c774de0d8ab)
Diffstat (limited to 'deploy/adapters/ansible/roles/open-contrail/templates/provision')
3 files changed, 6 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-analytics-api-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-analytics-api-conf.j2 index dd5e121e..9fbeeca5 100755 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-analytics-api-conf.j2 +++ b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-analytics-api-conf.j2 @@ -1,5 +1,5 @@ [DEFAULTS] -host_ip = {{ contrail_address }} +host_ip = {{ contrail_haproxy_address }} rest_api_ip = {{ contrail_haproxy_address }} rest_api_port = 8081 #cassandra_server_list = {% for cur_host in groups['controller'] %}{{ ip_settings[cur_host]['mgmt']['ip'] }}:9160{% if not loop.last %} {% endif %}{% endfor %} diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-query-engine-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-query-engine-conf.j2 index 3eb20443..d1228b11 100755 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-query-engine-conf.j2 +++ b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-query-engine-conf.j2 @@ -1,6 +1,10 @@ [DEFAULT] hostip = {{ contrail_address }} + + #cassandra_server_list = {% for cur_host in groups['controller'] %}{{ ip_settings[cur_host]['mgmt']['ip'] }}:9160{% if not loop.last %} {% endif %}{% endfor %} + + cassandra_server_list = {% for cur_host in groups['controller'] %}{{ haproxy_hosts[cur_host] }}:9160{% if not loop.last %} {% endif %}{% endfor %} collectors = {{ contrail_haproxy_address }}:8086 diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-vrouter-agent-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-vrouter-agent-conf.j2 index 61a517c9..d15ec386 100755 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-vrouter-agent-conf.j2 +++ b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-vrouter-agent-conf.j2 @@ -127,7 +127,7 @@ control_network_ip = {{ contrail_haproxy_address }} name = vhost0 # IP address and prefix in ip/prefix_len format -ip = {{ contrail_vhost_address }}/{{ contrail_prefixlen }} +ip = {{ contrail_vhost_address }}{{ lastip.stdout_lines[0] }}/{{ contrail_prefixlen }} # Gateway IP address for virtual host gateway = {{ contrail_vhost_gateway }} |