openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Set default for network.ip_subnet"

This commit is contained in:
Zuul 2021-06-04 21:19:50 +00:00 committed by Gerrit Code Review
parent eda3690a08 ed8bdde212
commit cf3dcef5e0
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
network/network.j2
View File

@ -1,3 +1,6 @@
{%- if ipv6_override is not defined %}
{%- set ipv6_override = false %}
{%- endif %}
heat_template_version: wallaby heat_template_version: wallaby
description: > description: >
@ -6,7 +9,7 @@ description: >
parameters: parameters:
# the defaults here work for static IP assignment (IPAM) only # the defaults here work for static IP assignment (IPAM) only
{{network.name}}NetCidr: {{network.name}}NetCidr:
{%- if network.ipv6 or ipv6_override %} {%- if network.ipv6|default(false) or ipv6_override %}
default: "{{network.ipv6_subnet|default(network.ip_subnet|default(""))}}" default: "{{network.ipv6_subnet|default(network.ip_subnet|default(""))}}"
{%- else %} {%- else %}
default: "{{network.ip_subnet|default("")}}" default: "{{network.ip_subnet|default("")}}"
@ -38,14 +41,14 @@ parameters:
description: The name of the {{network.name_lower}} subnet in Neutron. description: The name of the {{network.name_lower}} subnet in Neutron.
type: string type: string
{{network.name}}AllocationPools: {{network.name}}AllocationPools:
{%- if ":" in network.ip_subnet or network.ipv6 or ipv6_override %} {%- if ":" in network.ip_subnet|default("") or network.ipv6|default(false) or ipv6_override %}
default: {{network.ipv6_allocation_pools|default(network.allocation_pools|default([]))}} default: {{network.ipv6_allocation_pools|default(network.allocation_pools|default([]))}}
{%- else %} {%- else %}
default: {{network.allocation_pools|default([])}} default: {{network.allocation_pools|default([])}}
{%- endif %} {%- endif %}
description: Ip allocation pool range for the {{network.name_lower}} network. description: Ip allocation pool range for the {{network.name_lower}} network.
type: json type: json
{%- if ":" in network.ip_subnet or network.ipv6 or ipv6_override %} {%- if ":" in network.ip_subnet|default("") or network.ipv6|default(false) or ipv6_override %}
IPv6AddressMode: IPv6AddressMode:
default: dhcpv6-stateful default: dhcpv6-stateful
description: Neutron subnet IPv6 address mode description: Neutron subnet IPv6 address mode
@ -56,7 +59,7 @@ parameters:
type: string type: string
{%- endif %} {%- endif %}
{{network.name}}InterfaceDefaultRoute: {{network.name}}InterfaceDefaultRoute:
{%- if network.ipv6 or ipv6_override %} {%- if network.ipv6|default(false) or ipv6_override %}
default: "{{network.gateway_ipv6|default(network.gateway_ip|default(''))}}" default: "{{network.gateway_ipv6|default(network.gateway_ip|default(''))}}"
{%- else %} {%- else %}
default: "{{network.gateway_ip|default('')}}" default: "{{network.gateway_ip|default('')}}"
@ -83,7 +86,7 @@ parameters:
type: number type: number
{%- for subnet in network.subnets|default({}) if network.subnets[subnet].enabled|default(true) %} {%- for subnet in network.subnets|default({}) if network.subnets[subnet].enabled|default(true) %}
{{network.name}}SubnetCidr_{{subnet}}: {{network.name}}SubnetCidr_{{subnet}}:
{%- if network.ipv6 or ipv6_override %} {%- if network.ipv6|default(false) or ipv6_override %}
default: "{{network.subnets[subnet]['ipv6_subnet']|default(network.subnets[subnet]['ip_subnet']|default(""))}}" default: "{{network.subnets[subnet]['ipv6_subnet']|default(network.subnets[subnet]['ip_subnet']|default(""))}}"
{%- else %} {%- else %}
default: "{{network.subnets[subnet]['ip_subnet']|default("")}}" default: "{{network.subnets[subnet]['ip_subnet']|default("")}}"
@ -92,7 +95,7 @@ parameters:
Cidr for the {{network.name_lower}} network's {{subnet}} subnet. Cidr for the {{network.name_lower}} network's {{subnet}} subnet.
type: string type: string
{{network.name}}AllocationPools_{{subnet}}: {{network.name}}AllocationPools_{{subnet}}:
{%- if ":" in network.subnets[subnet]['ip_subnet'] or network.ipv6 or ipv6_override %} {%- if ":" in network.subnets[subnet]['ip_subnet'] or network.ipv6|default(false) or ipv6_override %}
default: {{network.subnets[subnet]['ipv6_allocation_pools']|default(network.subnets[subnet]['allocation_pools']|default([]))}} default: {{network.subnets[subnet]['ipv6_allocation_pools']|default(network.subnets[subnet]['allocation_pools']|default([]))}}
{%- else %} {%- else %}
default: {{network.subnets[subnet]['allocation_pools']|default([])}} default: {{network.subnets[subnet]['allocation_pools']|default([])}}
@ -101,7 +104,7 @@ parameters:
Ip allocation pool range for the {{network.name_lower}} network's {{subnet}} subnet. Ip allocation pool range for the {{network.name_lower}} network's {{subnet}} subnet.
type: json type: json
{{network.name}}InterfaceDefaultRoute_{{subnet}}: {{network.name}}InterfaceDefaultRoute_{{subnet}}:
{%- if ":" in network.subnets[subnet]['ip_subnet'] or network.ipv6 or ipv6_override %} {%- if ":" in network.subnets[subnet]['ip_subnet'] or network.ipv6|default(false) or ipv6_override %}
default: "{{network.subnets[subnet]['gateway_ipv6']|default(network.subnets[subnet]['gateway_ip']|default([]))}}" default: "{{network.subnets[subnet]['gateway_ipv6']|default(network.subnets[subnet]['gateway_ip']|default([]))}}"
{%- else %} {%- else %}
default: "{{network.subnets[subnet]['gateway_ip']|default([])}}" default: "{{network.subnets[subnet]['gateway_ip']|default([])}}"
@ -184,7 +187,7 @@ resources:
{%- if network.service_net_map_replace|default('') %} {%- if network.service_net_map_replace|default('') %}
- tripleo_service_net_map_replace={{network.service_net_map_replace}} - tripleo_service_net_map_replace={{network.service_net_map_replace}}
{%- endif %} {%- endif %}
{%- if network.ipv6 or ipv6_override %} {%- if network.ipv6|default(false) or ipv6_override %}
- tripleo_ipv6=true - tripleo_ipv6=true
{%- endif %} {%- endif %}
@ -205,7 +208,7 @@ resources:
# All networks have an implicit network segment when created, map this subnet to that segment. # All networks have an implicit network segment when created, map this subnet to that segment.
segment: {get_attr: [{{network.name}}Network, segments, 0, id]} segment: {get_attr: [{{network.name}}Network, segments, 0, id]}
ip_version: {if: [is_ipv6, 6, 4]} ip_version: {if: [is_ipv6, 6, 4]}
{%- if ":" in network.ip_subnet or network.ipv6 or ipv6_override %} {%- if ":" in network.ip_subnet|default("") or network.ipv6|default(false) or ipv6_override %}
ipv6_address_mode: {get_param: IPv6AddressMode} ipv6_address_mode: {get_param: IPv6AddressMode}
ipv6_ra_mode: {get_param: IPv6RAMode} ipv6_ra_mode: {get_param: IPv6RAMode}
{%- else %} {%- else %}
@ -253,7 +256,7 @@ resources:
host_routes: {get_param: {{network.name}}Routes_{{subnet}}} host_routes: {get_param: {{network.name}}Routes_{{subnet}}}
segment: {get_resource: {{network.name}}Segment_{{subnet}}} segment: {get_resource: {{network.name}}Segment_{{subnet}}}
ip_version: {if: [is_ipv6, 6, 4]} ip_version: {if: [is_ipv6, 6, 4]}
{%- if ":" in network.ip_subnet or network.ipv6 or ipv6_override %} {%- if ":" in network.ip_subnet|default("") or network.ipv6|default(false) or ipv6_override %}
ipv6_address_mode: {get_param: IPv6AddressMode} ipv6_address_mode: {get_param: IPv6AddressMode}
ipv6_ra_mode: {get_param: IPv6RAMode} ipv6_ra_mode: {get_param: IPv6RAMode}
{%- else %} {%- else %}

5
network/ports/port_from_pool.j2
View File

@ -1,3 +1,6 @@
{%- if ipv6_override is not defined %}
{%- set ipv6_override = false %}
{%- endif %}
heat_template_version: wallaby heat_template_version: wallaby
description: > description: >
@ -53,7 +56,7 @@ parameters:
default: 0 default: 0
type: number type: number
{{network.name}}NetCidr: {{network.name}}NetCidr:
{%- if network.ipv6 or ipv6_override %} {%- if network.ipv6|default(false) or ipv6_override %}
default: "{{network.ipv6_subnet|default(network.ip_subnet|default(""))}}" default: "{{network.ipv6_subnet|default(network.ip_subnet|default(""))}}"
{%- else %} {%- else %}
default: "{{network.ip_subnet|default("")}}" default: "{{network.ip_subnet|default("")}}"