diff options
| -rw-r--r-- | ci/PR_revision.log | 2 | ||||
| -rw-r--r-- | config/network/network_settings_v6.yaml | 4 | ||||
| -rw-r--r-- | lib/python/apex/network_environment.py | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/ci/PR_revision.log b/ci/PR_revision.log index 1885bfb4..361a906a 100644 --- a/ci/PR_revision.log +++ b/ci/PR_revision.log @@ -5,3 +5,5 @@ apex-tripleo-heat-templates, Ie108ab75cce0cb7d89e72637c600e30fc241d186 apex-puppet-tripleo, Ic9a955a1c2afc040b2f9c6fb86573c04a60f9f31 apex-tripleo-heat-templates: Ibada3c58e2ba870defef356363dbf54d02c8a965 + +apex-puppet-tripleo, Ie336c22b366bd478963ca14e25d645fec0cded7a
\ No newline at end of file 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' |