diff options
| author |   chenshuai@huawei.com <chenshuai@huawei.com> | 2016-04-15 09:57:12 +0800 |
|---|---|---|
| committer | chenshuai@huawei.com <chenshuai@huawei.com> | 2016-04-15 09:57:12 +0800 |
| commit | ed90c8dde54f99c44ff94a593d7d62505c463b6d (patch) | |
| tree | 0f07a2f031dd94c8f1f74dfd7a3a180cdf44b0d9 /deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-discovery-conf.j2 | |
| parent | 06cf46de14100257cc6843c01ffc92216550b06d (diff) | |
opencontrail: data/control plane should be same
JIRA: COMPASS-368
Change-Id: Id365065ff985cadcf24938413c1c648a8ab44160
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-discovery-conf.j2')
| -rwxr-xr-x | deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-discovery-conf.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-discovery-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-discovery-conf.j2 index dfcc0e3a..f54fdc94 100755 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-discovery-conf.j2 +++ b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-discovery-conf.j2 @@ -1,10 +1,10 @@ [DEFAULTS] listen_ip_addr = {{ contrail_haproxy_address }} listen_port = 5998 -zk_server_ip = {% for cur_host in groups['opencontrail'] %}{{ haproxy_hosts[cur_host] }}{% if not loop.last %}, {% endif %}{% endfor %} +zk_server_ip = {% for cur_host in groups['opencontrail'] %}{{ ip_settings[cur_host]['br-prv']['ip'] }}{% if not loop.last %}, {% endif %}{% endfor %} zk_server_port = 2181 -cassandra_server_list = {% for cur_host in groups['opencontrail'] %}{{ haproxy_hosts[cur_host] }}:9160{% if not loop.last %} {% endif %}{% endfor %} +cassandra_server_list = {% for cur_host in groups['opencontrail'] %}{{ ip_settings[cur_host]['br-prv']['ip'] }}:9160{% if not loop.last %} {% endif %}{% endfor %} log_file = /var/log/contrail/contrail-discovery.log log_level = SYS_NOTICE |