aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/open-contrail/templates/provision
diff options
context:
space:
mode:
authorchenshuai@huawei.com <chenshuai@huawei.com>2016-01-16 16:51:54 +0800
committershuai chen <chenshuai@huawei.com>2016-01-21 14:48:57 +0000
commit9e1a57ca0b97e49813ae6c19dab7e12c21721717 (patch)
treea8b97f6302a04c844708597232dcdc50b5f7c07c /deploy/adapters/ansible/roles/open-contrail/templates/provision
parenta4219c125fb57adf6394f7f3e1488eb9aaeb82e4 (diff)
bugfix: opencontrail neutron and nova plugins code
JIRA: COMPASS-274 Change-Id: I6ee4b9fac51a0fc5f4ac9916ea16ab9d363ec943 Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com> (cherry picked from commit 4113bc2656c86f6057dcf3bc5f18ac1e3619fd45)
Diffstat (limited to 'deploy/adapters/ansible/roles/open-contrail/templates/provision')
-rwxr-xr-xdeploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-vrouter-agent-conf.j24
1 files changed, 2 insertions, 2 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 78b31775..d0d6b966 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_device]['macaddress'] }}
+physical_interface_mac = {{ hostvars[inventory_hostname][contrail_vhost_device]['macaddress'] }}
[DISCOVERY]
# If COLLECTOR and/or CONTROL-NODE and/or DNS is not specified this section is
@@ -133,7 +133,7 @@ ip = {{ contraili_vhost_address }}/{{ contrail_prefixlen }}
gateway = {{ contrail_vhost_gateway }}
# Physical interface name to which virtual host interface maps to
-physical_interface = {{ contrail_device }}
+physical_interface = {{ contrail_vhost_device }}
# We can have multiple gateway sections with different indices in the
# following format