diff options
| author |   chenshuai@huawei.com <chenshuai@huawei.com> | 2016-01-16 01:35:52 +0800 |
|---|---|---|
| committer | shuai chen <chenshuai@huawei.com> | 2016-01-21 06:53:44 +0000 |
| commit | 6c48d465b98f2255d5374903df8c73dbc4e9adaf (patch) | |
| tree | 925a1921dddfbd84c79ad8d9a6bcbad5c4926611 /deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-vrouter-agent-conf.j2 | |
| parent | 9f974e0578f68f9e31807d07b4c47614054cae00 (diff) | |
bugfix: workaround for opencontrail
JIRA: COMPASS-271
Change-Id: Ib4bbc0536ed8877f5e38150e5d710578345ac56b
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
(cherry picked from commit 6b168a9b8c44c141f71c2eab7e51973f3523f912)
Diffstat (limited to 'deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-vrouter-agent-conf.j2')
| -rwxr-xr-x | deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-vrouter-agent-conf.j2 | 8 |
1 files changed, 4 insertions, 4 deletions
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 207509e5..78b31775 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 @@ -66,7 +66,7 @@ platform = default physical_interface_address = # MAC address of device used by dpdk -physical_interface_mac = {{ hostvars[inventory_hostname][contrail_ansible_device]['macaddress'] }} +physical_interface_mac = {{ hostvars[inventory_hostname][contrail_device]['macaddress'] }} [DISCOVERY] # If COLLECTOR and/or CONTROL-NODE and/or DNS is not specified this section is @@ -118,7 +118,7 @@ vmware_physical_interface = [NETWORKS] # control-channel IP address used by WEB-UI to connect to vnswad to fetch # required information (Optional) -control_network_ip = {{ contrail_address }} +control_network_ip = {{ contrail_haproxy_address }} [VIRTUAL-HOST-INTERFACE] # Everything in this section is mandatory @@ -127,10 +127,10 @@ control_network_ip = {{ contrail_address }} name = vhost0 # IP address and prefix in ip/prefix_len format -ip = {{ contrail_address }}/{{ contrail_prefixlen }} +ip = {{ contraili_vhost_address }}/{{ contrail_prefixlen }} # Gateway IP address for virtual host -gateway = {{ contrail_gateway }} +gateway = {{ contrail_vhost_gateway }} # Physical interface name to which virtual host interface maps to physical_interface = {{ contrail_device }} |