diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-03-06 17:15:37 -0500 |
|---|---|---|
| committer |   Feng Pan <fpan@redhat.com> | 2017-03-24 14:58:21 -0400 |
| commit | 4cdcfa9d933dba8ffd43e034be00e58a5b9501ab (patch) | |
| tree | 732c9385308dbd2b404373f34e0744370487e882 /build/nics-template.yaml.jinja2 | |
| parent | 783bead17dbff69b3f07fc99bafb784987b59d94 (diff) | |
Fixes OVS DPDK scenarios
This fixes nosdn OVS DPDK scenarios to work with OVS 2.6. It also adds
support for the ODL DPDK scenario. OVS DPDK configuration is done
during preconfig on compute nodes. All nodes make use of first boot
script to get kernel params like hugepages. The network settings are
modified to use real nic names for the virtual network settings file.
This is required due to a timing bug with os-net-config and using
first-boot script. The network settings file also contains the UIO
driver to use with DPDK.
JIRA: APEX-314
opnfv-tht-pr: 117
Change-Id: I46b6fca71ecec38981968133ba2411f64d7c6445
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build/nics-template.yaml.jinja2')
| -rw-r--r-- | build/nics-template.yaml.jinja2 | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2 index f2c8000a..0913fa98 100644 --- a/build/nics-template.yaml.jinja2 +++ b/build/nics-template.yaml.jinja2 @@ -156,7 +156,7 @@ resources: {%- if nets['tenant']['enabled'] and nets['tenant']['nic_mapping'][role]['vlan'] == 'native' %} {%- if ovs_dpdk_bridge == 'br-phy' and role == 'compute' %} - - type: ovs_bridge + type: ovs_user_bridge name: {{ ovs_dpdk_bridge }} use_dhcp: false addresses: @@ -164,14 +164,15 @@ resources: ip_netmask: {get_param: TenantIpSubnet} members: - - type: interface - name: {{ nets['tenant']['nic_mapping'][role]['members'][0] }} - # force the MAC address of the bridge to this interface - primary: true - - - type: ovs_bridge - name: br-tun - use_dhcp: false + type: ovs_dpdk_port + name: dpdk0 + driver: {{ nets['tenant']['nic_mapping'][role]['uio_driver'] }} + members: + - + type: interface + name: {{ nets['tenant']['nic_mapping'][role]['members'][0] }} + # force the MAC address of the bridge to this interface + primary: true {%- else %} - type: {{ nets['tenant']['nic_mapping'][role]['phys_type'] }} @@ -208,7 +209,11 @@ resources: next_hop: {get_param: ExternalInterfaceDefaultRoute} {%- elif nets['external'][0]['enabled'] and external_net_type == 'br-ex' and nets['external'][0]['nic_mapping'][role]['vlan'] == 'native' %} - + {%- if ovs_dpdk_bridge == 'br-phy' and role == 'compute' %} + type: ovs_user_bridge + {%- else %} type: ovs_bridge + {%- endif %} name: {get_input: bridge_name} use_dhcp: false members: |