From 0cd3c6cef32adb1bf9d26414ed73bd9373b0c407 Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Thu, 15 Mar 2018 19:44:39 -0400 Subject: 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 --- apex/overcloud/config.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'apex') diff --git a/apex/overcloud/config.py b/apex/overcloud/config.py index b0cbb18b..e8d8fbb0 100644 --- a/apex/overcloud/config.py +++ b/apex/overcloud/config.py @@ -52,6 +52,9 @@ def create_nic_template(network_settings, deploy_settings, role, template_dir, if ds.get('dvr') is True: nets['admin']['nic_mapping'][role]['phys_type'] = \ 'linux_bridge' + else: + nets['external'][0]['nic_mapping'][role]['phys_type'] = \ + 'linux_bridge' elif ds['dataplane'] == 'ovs_dpdk': ovs_dpdk_br = 'br-phy' if (ds.get('performance', {}).get(role.title(), {}).get('vpp', {}) -- cgit 1.2.3-korg