diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-06-05 14:53:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-06-05 14:53:35 +0000 |
| commit | 341d03f86b718e0d556c2e12baebdca8760a28ec (patch) | |
| tree | c1e75cd6ca3b15d0850a67eddc2c4bb13bfb48d2 | |
| parent | 652d97b4808ae3cd31a7440d59bc50cb0a157143 (diff) | |
| parent | 91290a177c3ea70f14fa086cbe618d1b70eb2fe6 (diff) | |
Merge "Add overlay_ip_version config for IPv6 tenant networks" into stable/danube
| -rw-r--r-- | config/network/network_settings_v6.yaml | 3 | ||||
| -rw-r--r-- | lib/python/apex/network_environment.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config/network/network_settings_v6.yaml b/config/network/network_settings_v6.yaml index 54c4113f..cee2c24d 100644 --- a/config/network/network_settings_v6.yaml +++ b/config/network/network_settings_v6.yaml @@ -89,7 +89,7 @@ networks: # Network configurations # tenant: # Tenant network configuration enabled: true - cidr: 11.0.0.0/24 # Subnet in CIDR format 192.168.1.0/24 + cidr: fd00:fd00:fd00:6000::/64 # Subnet in CIDR format 192.168.1.0/24 mtu: 1500 # Tenant network MTU overlay_id_range: 2,65535 # Tenant network Overlay segmentation ID range: # VNI, VLAN-ID, etc. @@ -157,7 +157,6 @@ networks: # Network configurations api: # API network configuration enabled: true cidr: fd00:fd00:fd00:4000::/64 # Subnet in CIDR format - vlan: 13 # VLAN tag to use for Overcloud hosts on this network mtu: 1500 # Api network MTU nic_mapping: # Mapping of network configuration for Overcloud Nodes compute: # Mapping for compute profile (nodes that will be used as Compute nodes) diff --git a/lib/python/apex/network_environment.py b/lib/python/apex/network_environment.py index dbe89b21..211fe682 100644 --- a/lib/python/apex/network_environment.py +++ b/lib/python/apex/network_environment.py @@ -120,6 +120,7 @@ class NetworkEnvironment(dict): self[param_def]['TenantNetCidr'] = str(tenant_cidr) if tenant_cidr.version == 6: postfix = '/tenant_v6.yaml' + self[param_def]['NeutronOverlayIPVersion'] = '"6"' else: postfix = '/tenant.yaml' @@ -161,6 +162,7 @@ class NetworkEnvironment(dict): self[param_def]['InternalApiNetCidr'] = str(api_cidr) if api_cidr.version == 6: postfix = '/internal_api_v6.yaml' + # set overlay_ip_version option in Neutron ML2 config else: postfix = '/internal_api.yaml' api_vlan = self._get_vlan(nets[API_NETWORK]) |