diff options
author | Feng Pan <fpan@redhat.com> | 2017-09-11 15:58:49 -0400 |
---|---|---|
committer | Feng Pan <fpan@redhat.com> | 2017-09-28 19:56:09 -0400 |
commit | a3c2c8c746470c993d70d92d13415e2b4263cc25 (patch) | |
tree | 503f3a4deed376768693bac148a36a145c55cbfe /apex/overcloud/config.py | |
parent | 7af8cf039ef21da528a8cb53e0eb78c1b6878714 (diff) |
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 <fpan@redhat.com>
Diffstat (limited to 'apex/overcloud/config.py')
-rw-r--r-- | apex/overcloud/config.py | 12 |
1 files changed, 8 insertions, 4 deletions
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', {}) |