From a3c2c8c746470c993d70d92d13415e2b4263cc25 Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Mon, 11 Sep 2017 15:58:49 -0400 Subject: re-enable support for fdio dvr scenario - Update FDIO scenarios to use master branch images - Update VPP/HC version to master for all fdio scenarios apex-os-net-config: Ie6aee86eaccad5fc98820a28f10adc7475cc5e33 apex-tripleo-heat-templates: Ie8b284f64bd6491c389129d8afdaeae8a399b607 apex-puppet-tripleo: I9954240529278e74d93fdf89d2ebc2536249245a Change-Id: I31740f97052947b5e4688cca47320bc49a902d7c Signed-off-by: Feng Pan --- apex/overcloud/config.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'apex/overcloud/config.py') diff --git a/apex/overcloud/config.py b/apex/overcloud/config.py index e48b254f..a7f7d848 100644 --- a/apex/overcloud/config.py +++ b/apex/overcloud/config.py @@ -44,10 +44,14 @@ def create_nic_template(network_settings, deploy_settings, role, template_dir, ovs_dpdk_br = '' if ds['dataplane'] == 'fdio': nets['tenant']['nic_mapping'][role]['phys_type'] = 'vpp_interface' - if ds['sdn_controller'] == 'opendaylight' and role == 'compute': - nets['external'][0]['nic_mapping'][role]['phys_type'] = \ - 'vpp_interface' - ext_net = 'vpp_interface' + if ds['sdn_controller'] == 'opendaylight': + if role == 'compute': + nets['external'][0]['nic_mapping'][role]['phys_type'] = \ + 'vpp_interface' + ext_net = 'vpp_interface' + if ds.get('dvr') is True: + nets['admin']['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