diff options
| author |   chenshuai@huawei.com <chenshuai@huawei.com> | 2015-12-29 17:27:25 +0800 |
|---|---|---|
| committer | chenshuai@huawei.com <chenshuai@huawei.com> | 2015-12-31 09:28:36 +0800 |
| commit | 55baaadf3ee21bf5769ee791533b66d28f9455ef (patch) | |
| tree | 4972789da9d8b5eb807f8a3466261a8e219cea86 /deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-discovery-conf.j2 | |
| parent | 48286d3db939134823792b9bff7451d554e86f24 (diff) | |
bugfix: opencontrail add force parameter for apt-get install
JIRA: COMPASS-227
Change-Id: I4e9ae9dfed29f6d58c9200d21f09cf2a71961ca1
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 | 6 |
1 files changed, 3 insertions, 3 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 6abcb590..509b3569 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 = 0.0.0.0 +listen_ip_addr = {{ contrail_haproxy_address }} listen_port = 5998 -zk_server_ip = {% for cur_host in groups['opencontrail_database'] %}{{ hostvars[cur_host]['ansible_' + internal_nic].ipv4.address }}{% if not loop.last %}, {% endif %}{% endfor %} +zk_server_ip = {% for cur_host in groups['opencontrail_database'] %}{{ haproxy_hosts[cur_host] }}{% if not loop.last %}, {% endif %}{% endfor %} zk_server_port = 2181 -cassandra_server_list = {% for cur_host in groups['opencontrail_database'] %}{{ hostvars[cur_host]['ansible_' + internal_nic].ipv4.address }}:9160{% if not loop.last %} {% endif %}{% endfor %} +cassandra_server_list = {% for cur_host in groups['opencontrail_database'] %}{{ haproxy_hosts[cur_host] }}:9160{% if not loop.last %} {% endif %}{% endfor %} log_file = /var/log/contrail/contrail-discovery.log log_level = SYS_NOTICE |