diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-09-29 23:17:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-29 23:17:53 +0000 |
| commit | c104a284855069882e2625c57b5c2c78b0c6ba4d (patch) | |
| tree | a11156ea94ff9dfddcc278c973771d66c452c332 /apex/overcloud/config.py | |
| parent | 5729ad141664925d922ea6cbea7cdcde09d9b18c (diff) | |
| parent | b6896a9bbfd7d4825f6b68b594441a3e0be7b85f (diff) | |
Merge "re-enable support for fdio dvr scenario" into stable/euphrates
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', {}) |