From 78a9d70f7f6a5b0b0f941c849a9250da2181c428 Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Wed, 22 Feb 2017 14:44:39 -0500 Subject: Add support for odl_l3-fdio This patch adds support for ODL L3 FDIO scenario. Introduces a new deploy settings parameter, odl_routing_node, to indicate the routing node's hostname. This parameter will only be used for this scenario. Change-Id: I8df3eb701299007761c6cec42c4ca318b124a0b8 opnfv-tht-pr: 108 os-net-config-pr: 4 Signed-off-by: Feng Pan (cherry picked from commit 7d994a3c3e18227c26bf58049e4d5780144ecf98) --- build/nics-template.yaml.jinja2 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'build/nics-template.yaml.jinja2') diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2 index 920e9a1b..f2c8000a 100644 --- a/build/nics-template.yaml.jinja2 +++ b/build/nics-template.yaml.jinja2 @@ -176,8 +176,8 @@ resources: - type: {{ nets['tenant']['nic_mapping'][role]['phys_type'] }} name: {{ nets['tenant']['nic_mapping'][role]['members'][0] }} - {%- if 'uio_driver' in nets['tenant']['nic_mapping'][role] %} - uio_driver: {{ nets['tenant']['nic_mapping'][role]['uio_driver'] }} + {%- if 'uio-driver' in nets['tenant']['nic_mapping'][role] %} + uio_driver: {{ nets['tenant']['nic_mapping'][role]['uio-driver'] }} {%- endif %} use_dhcp: false addresses: @@ -185,10 +185,13 @@ resources: ip_netmask: {get_param: TenantIpSubnet} {%- endif %} {%- endif %} - {%- if nets['external'][0]['enabled'] and external_net_type == 'interface' and nets['external'][0]['nic_mapping'][role]['vlan'] == 'native' %} + {%- if nets['external'][0]['enabled'] and external_net_type != 'br-ex' and nets['external'][0]['nic_mapping'][role]['vlan'] == 'native' %} - - type: interface + type: {{ nets['external'][0]['nic_mapping'][role]['phys_type'] }} name: {{ nets['external'][0]['nic_mapping'][role]['members'][0] }} + {%- if 'uio-driver' in nets['external'][0]['nic_mapping'][role] %} + uio_driver: {{ nets['external'][0]['nic_mapping'][role]['uio-driver'] }} + {%- endif %} {%- if role == 'controller' %} dns_servers: {get_param: DnsServers} {%- endif %} -- cgit 1.2.3-korg