From 4113bc2656c86f6057dcf3bc5f18ac1e3619fd45 Mon Sep 17 00:00:00 2001 From: "chenshuai@huawei.com" Date: Sat, 16 Jan 2016 16:51:54 +0800 Subject: bugfix: opencontrail neutron and nova plugins code JIRA: COMPASS-274 Change-Id: I6ee4b9fac51a0fc5f4ac9916ea16ab9d363ec943 Signed-off-by: chenshuai@huawei.com --- .../templates/neutron_plugin_contrail.tar.gz | Bin 0 -> 73771 bytes .../open-contrail/templates/nova_contrail_vif.tar.gz | Bin 0 -> 3552 bytes .../templates/provision/contrail-vrouter-agent-conf.j2 | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 deploy/adapters/ansible/roles/open-contrail/templates/neutron_plugin_contrail.tar.gz create mode 100644 deploy/adapters/ansible/roles/open-contrail/templates/nova_contrail_vif.tar.gz (limited to 'deploy/adapters/ansible/roles/open-contrail/templates') 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 Binary files /dev/null and b/deploy/adapters/ansible/roles/open-contrail/templates/neutron_plugin_contrail.tar.gz 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 Binary files /dev/null and b/deploy/adapters/ansible/roles/open-contrail/templates/nova_contrail_vif.tar.gz 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 -- cgit 1.2.3-korg