diff options
Diffstat (limited to 'lib/python')
-rw-r--r-- | lib/python/apex/deploy_settings.py | 2 | ||||
-rwxr-xr-x | lib/python/apex_python_utils.py | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/python/apex/deploy_settings.py b/lib/python/apex/deploy_settings.py index 9fb4c6f7..dc58d764 100644 --- a/lib/python/apex/deploy_settings.py +++ b/lib/python/apex/deploy_settings.py @@ -34,7 +34,7 @@ OPT_DEPLOY_SETTINGS = ['performance', 'odl_vpp_routing_node'] VALID_ROLES = ['Controller', 'Compute', 'ObjectStorage'] -VALID_PERF_OPTS = ['kernel', 'nova', 'vpp'] +VALID_PERF_OPTS = ['kernel', 'nova', 'vpp', 'ovs'] VALID_DATAPLANES = ['ovs', 'ovs_dpdk', 'fdio'] diff --git a/lib/python/apex_python_utils.py b/lib/python/apex_python_utils.py index 830af360..1f49d474 100755 --- a/lib/python/apex_python_utils.py +++ b/lib/python/apex_python_utils.py @@ -123,6 +123,10 @@ def build_nic_template(args): if ds['sdn_l3']: 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'] =\ + ds['performance'][args.role.title()]['vpp']['interface-options'] print(template.render(nets=nets, role=args.role, |