diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-08-11 00:45:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-11 00:45:04 +0000 |
| commit | 240fb2eeb9398871e55703f9e62bc7fbb4e01162 (patch) | |
| tree | e0f7785666fe009b77b297c53d16a5cc8829eb67 | |
| parent | 664d78f23c41ee364a7bbf2512932a865811db9e (diff) | |
| parent | affa1d140da054d2ef6d4f15da4fd8d6ee37a332 (diff) | |
Merge "Remove extra VPP interface from fdio-nosdn scenarios"
| -rw-r--r-- | build/opnfv-environment.yaml | 2 | ||||
| -rwxr-xr-x | lib/python/apex_python_utils.py | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml index 8140d0d7..8bd1c10b 100644 --- a/build/opnfv-environment.yaml +++ b/build/opnfv-environment.yaml @@ -12,6 +12,8 @@ parameter_defaults: NeutronEnableDHCPMetadata: true NeutronEnableIsolatedMetadata: true NeutronPluginExtensions: 'qos,port_security,data_plane_status' + # TODO: VLAN Ranges should be configurable from network settings + NeutronNetworkVLANRanges: 'datacentre:500:525' # NeutronVPPAgentPhysnets: # NovaSchedulerDefaultFilters: # # Kernel arguments, this value will be set to kernel arguments specified diff --git a/lib/python/apex_python_utils.py b/lib/python/apex_python_utils.py index c4c6dfe8..063aa003 100755 --- a/lib/python/apex_python_utils.py +++ b/lib/python/apex_python_utils.py @@ -113,14 +113,16 @@ def build_nic_template(args): if ds['dataplane'] == 'fdio': nets['tenant']['nic_mapping'][args.role]['phys_type'] = 'vpp_interface' - nets['external'][0]['nic_mapping'][args.role]['phys_type'] =\ - 'vpp_interface' + if ds['sdn_controller'] == 'opendaylight': + nets['external'][0]['nic_mapping'][args.role]['phys_type'] =\ + 'vpp_interface' if ds.get('performance', {}).get(args.role.title(), {}).get('vpp', {})\ .get('uio-driver'): nets['tenant']['nic_mapping'][args.role]['uio-driver'] =\ ds['performance'][args.role.title()]['vpp']['uio-driver'] - nets['external'][0]['nic_mapping'][args.role]['uio-driver'] =\ - ds['performance'][args.role.title()]['vpp']['uio-driver'] + if ds['sdn_controller'] == 'opendaylight': + nets['external'][0]['nic_mapping'][args.role]['uio-driver'] =\ + ds['performance'][args.role.title()]['vpp']['uio-driver'] if ds.get('performance', {}).get(args.role.title(), {}).get('vpp', {})\ .get('interface-options'): nets['tenant']['nic_mapping'][args.role]['interface-options'] =\ |