summaryrefslogtreecommitdiffstats
path: root/lib/python/apex
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-08-02 18:12:46 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-02 18:12:46 +0000
commite248a7becb2b72b6d66edd9e7d5ce5739fdba13d (patch)
treea60c29a45b139c843a5763d5be13b1ef41aaad73 /lib/python/apex
parent98339f98d955bb046e9651f8c0c4f17eb2b0f79f (diff)
parent73dac8ac292bfbb16721549d41a4328dcb20e30e (diff)
Merge "Add overlay_ip_version config for IPv6 tenant networks"
Diffstat (limited to 'lib/python/apex')
-rw-r--r--lib/python/apex/network_environment.py2
1 files changed, 2 insertions, 0 deletions
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'