diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-08-02 18:12:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-02 18:12:46 +0000 |
| commit | e248a7becb2b72b6d66edd9e7d5ce5739fdba13d (patch) | |
| tree | a60c29a45b139c843a5763d5be13b1ef41aaad73 | |
| parent | 98339f98d955bb046e9651f8c0c4f17eb2b0f79f (diff) | |
| parent | 73dac8ac292bfbb16721549d41a4328dcb20e30e (diff) | |
Merge "Add overlay_ip_version config for IPv6 tenant networks"
| -rw-r--r-- | config/network/network_settings_v6.yaml | 4 | ||||
| -rw-r--r-- | lib/python/apex/network_environment.py | 2 |
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' |