openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Add ipv6 support in environments/deployed-network-environment.j2.yaml" into stable/wallaby

This commit is contained in:
Zuul 2022-08-18 09:52:00 +00:00 committed by Gerrit Code Review
parent 37f80a8c11 29fe994af2
commit 194acafce0
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
environments/deployed-network-environment.j2.yaml
View File

@ -36,11 +36,18 @@ parameter_defaults:
subnets:
{%- for subnet in network.subnets %}
{{ subnet }}:
{%- if not network.ipv6 %}
cidr: {{ network.subnets[subnet].ip_subnet }}
dns_nameservers: []
gateway_ip: {{ network.subnets[subnet].gateway_ip }}
host_routes: {{ network.subnets[subnet].routes | default([]) }}
ip_version: 4
{%- else %}
cidr: {{ network.subnets[subnet].ipv6_subnet }}
gateway_ip: {{ network.subnets[subnet].gateway_ipv6 }}
host_routes: {{ network.subnets[subnet].routes_ipv6 | default([]) }}
ip_version: 6
{%- endif %}
dns_nameservers: []
name: {{ subnet }}
tags:
{%- if network.subnets[subnet].vlan %}
@ -55,7 +62,11 @@ parameter_defaults:
{%- for network in networks if network.enabled|default(true) %}
{{ network.name_lower }}:
{%- for subnet in network.subnets %}
{%- if not network.ipv6 %}
- {{ network.subnets[subnet].ip_subnet }}
{%- else %}
- {{ network.subnets[subnet].ipv6_subnet }}
{%- endif %}
{%- endfor %}
{%- endfor %}