diff options
| author |   Feng Pan <fpan@redhat.com> | 2018-03-15 19:44:39 -0400 |
|---|---|---|
| committer |   Tim Rozet <trozet@redhat.com> | 2018-04-12 14:09:01 +0000 |
| commit | 4b8f1b163570256eee7cf69f4de61c7c6a84046c (patch) | |
| tree | 4cb99ae62b9fc24b4f0ffac274a5ef5aad4a338f /build/nics-template.yaml.jinja2 | |
| parent | 814c37ee17c9e797b5a4f1944bd52facf22fb513 (diff) | |
Enable nosdn-fdio scenarios for Fraser release
- Update neutron NSDriver patch
- Update os-net-config to fix config errors for vpp uio-driver
- Update puppet-tripleo to add configuration of physnets and type_driver
in vpp agent
- Update THT to change VPP environment file for vpp-agent, and add common.yaml
for vpp interface mapping
- Update VPP and networking-vpp version to 18.01
- Fix networking-vpp rpm build to enable proper uninstall.
- Update networking settings file to use ovs_bridge as default external interface type
JIRA: APEX-578
JIRA: APEX-568
JIRA: APEX-576
JIRA: APEX-577
apex-os-net-config: I915d5455acb8d496438b9c9e851639d3a43e6fa9
apex-puppet-tripleo: I472879b8f67e64b571638a0385943597a9120e6c
apex-tripleo-heat-templates: I5dfaf85d67fb038109edaf5c5d8a3e901b9148f4
Change-Id: I369bee232bfafef260d2ef19ac32614fdc487271
Signed-off-by: Feng Pan <fpan@redhat.com>
(cherry picked from commit 0cd3c6cef32adb1bf9d26414ed73bd9373b0c407)
Diffstat (limited to 'build/nics-template.yaml.jinja2')
| -rw-r--r-- | build/nics-template.yaml.jinja2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2 index 16083294..959a3926 100644 --- a/build/nics-template.yaml.jinja2 +++ b/build/nics-template.yaml.jinja2 @@ -232,7 +232,7 @@ resources: {%- if ovs_dpdk_bridge == 'br-phy' and role == 'compute' %} type: ovs_user_bridge {%- else %} - type: ovs_bridge + type: {{ nets['external'][0]['nic_mapping'][role]['phys_type'] }} {%- endif %} name: br-ex use_dhcp: false |