summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/network/network_settings_v6.yaml4
-rw-r--r--lib/python/apex/network_environment.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/config/network/network_settings_v6.yaml b/config/network/network_settings_v6.yaml
index c7e808c3..57257633 100644
--- a/config/network/network_settings_v6.yaml
+++ b/config/network/network_settings_v6.yaml
@@ -107,7 +107,7 @@ networks:
tenant:
enabled: true
# Subnet in CIDR format 192.168.1.0/24
- cidr: 11.0.0.0/24
+ cidr: fd00:fd00:fd00:6000::/64
# Tenant network MTU
mtu: 1500
# Tenant network Overlay segmentation ID range:
@@ -222,7 +222,7 @@ networks:
# Subnet in CIDR format
cidr: fd00:fd00:fd00:4000::/64
# VLAN tag to use for Overcloud hosts on this network
- vlan: 13
+ #vlan: 13
# Api network MTU
mtu: 1500
# Mapping of network configuration for Overcloud Nodes
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'