summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/open-contrail/templates
diff options
context:
space:
mode:
authorchenshuai@huawei.com <chenshuai@huawei.com>2016-01-17 12:28:08 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-17 12:28:08 +0000
commitdd509497f4c6865b26cd2e7aa2ea0ecc501edb96 (patch)
treed162691f91100daa9139c17243fbd8ed99e5b489 /deploy/adapters/ansible/roles/open-contrail/templates
parent02ada12260dccd2bcd372a7945719cc5bc817938 (diff)
parent4113bc2656c86f6057dcf3bc5f18ac1e3619fd45 (diff)
Merge "bugfix: opencontrail neutron and nova plugins code"
Diffstat (limited to 'deploy/adapters/ansible/roles/open-contrail/templates')
-rw-r--r--deploy/adapters/ansible/roles/open-contrail/templates/neutron_plugin_contrail.tar.gzbin0 -> 73771 bytes
-rw-r--r--deploy/adapters/ansible/roles/open-contrail/templates/nova_contrail_vif.tar.gzbin0 -> 3552 bytes
-rwxr-xr-xdeploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-vrouter-agent-conf.j24
3 files changed, 2 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/neutron_plugin_contrail.tar.gz b/deploy/adapters/ansible/roles/open-contrail/templates/neutron_plugin_contrail.tar.gz
new file mode 100644
index 00000000..08077049
--- /dev/null
+++ b/deploy/adapters/ansible/roles/open-contrail/templates/neutron_plugin_contrail.tar.gz
Binary files differ
diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/nova_contrail_vif.tar.gz b/deploy/adapters/ansible/roles/open-contrail/templates/nova_contrail_vif.tar.gz
new file mode 100644
index 00000000..78dac037
--- /dev/null
+++ b/deploy/adapters/ansible/roles/open-contrail/templates/nova_contrail_vif.tar.gz
Binary files differ
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