diff options
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/apex/deploy_settings.py | 3 | ||||
| -rw-r--r-- | lib/python/apex/network_environment.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/python/apex/deploy_settings.py b/lib/python/apex/deploy_settings.py index 1025fcea..06185941 100644 --- a/lib/python/apex/deploy_settings.py +++ b/lib/python/apex/deploy_settings.py @@ -31,7 +31,8 @@ OPT_DEPLOY_SETTINGS = ['performance', 'yardstick', 'dovetail', 'odl_vpp_routing_node', - 'odl_vpp_netvirt'] + 'odl_vpp_netvirt', + 'barometer'] VALID_ROLES = ['Controller', 'Compute', 'ObjectStorage'] VALID_PERF_OPTS = ['kernel', 'nova', 'vpp', 'ovs'] diff --git a/lib/python/apex/network_environment.py b/lib/python/apex/network_environment.py index dbe89b21..dd9530b8 100644 --- a/lib/python/apex/network_environment.py +++ b/lib/python/apex/network_environment.py @@ -120,6 +120,8 @@ class NetworkEnvironment(dict): self[param_def]['TenantNetCidr'] = str(tenant_cidr) if tenant_cidr.version == 6: postfix = '/tenant_v6.yaml' + # set overlay_ip_version option in Neutron ML2 config + self[param_def]['NeutronOverlayIPVersion'] = "6" else: postfix = '/tenant.yaml' |