dd299f08bd
This change renders the IPv6 versions of the isolated networks using j2. To allow for backward compatibility, there will be 2 versions of the network definitions, <network>.yaml and <network>_v6.yaml. If the ip_subnet contains an IPv6 address, or if ipv6: true is set on the network definition in network_data.yaml, then the <network>.yaml version will contain an IPv6 definition, otherwise the <network>.yaml will be IPv4, and the <network>_v6.yaml will be IPv6. In a future follow-up patch, we will probably only create the required versions of the networks, either IPv4, IPv6, not both. The ipv6_subnet, ipv6_allocation_pools, and ipv6_gateway settings in the network_data.yaml definition file are used for the <network>_v6.yaml network definition. Note that these subnet/cidr/gateway definitions only set the defaults, which can be overridden with parameters set in an environment file. Since the parameters for IP and subnet range are the same (e.g. InternalApiNetCidr applies to both IPv4/v6), only one version can be used at a time. If an operator wishes to use dual-stack IPv4/IPv6, then two different networks should be created, and both networks can be applied to a single interface. Note that the workflow for the operator is the same as before this change, but a new example template has been added to environments/network-environment-v6.yaml. Change-Id: I0e674e4b1e43786717ae6416571dde3a0e11a5cc Partially-Implements: blueprint composable-networks Closes-bug: 1714115
106 lines
3.8 KiB
Django/Jinja
106 lines
3.8 KiB
Django/Jinja
heat_template_version: pike
|
|
|
|
description: >
|
|
{{network.name}} network definition (automatically generated).
|
|
|
|
parameters:
|
|
# the defaults here work for static IP assignment (IPAM) only
|
|
{{network.name}}NetCidr:
|
|
{%- if network.ipv6 or ipv6_override %}
|
|
default: "{{network.ipv6_subnet|default(network.ip_subnet|default(""))}}"
|
|
{%- else %}
|
|
default: "{{network.ip_subnet|default("")}}"
|
|
{%- endif %}
|
|
description: Cidr for the {{network.name_lower}} network.
|
|
type: string
|
|
{{network.name}}NetValueSpecs:
|
|
default: {'provider:physical_network': '{{network.name_lower}}', 'provider:network_type': 'flat'}
|
|
description: Value specs for the {{network.name_lower}} network.
|
|
type: json
|
|
{%- if not ":" in network.ip_subnet and not network.ipv6 and not ipv6_override %}
|
|
{{network.name}}NetEnableDHCP:
|
|
default: false
|
|
description: Whether to enable DHCP on the associated subnet (IPv4 only).
|
|
type: boolean
|
|
{%- endif %}
|
|
{{network.name}}NetAdminStateUp:
|
|
default: false
|
|
description: The admin state of the network.
|
|
type: boolean
|
|
{{network.name}}NetShared:
|
|
default: false
|
|
description: Whether this network is shared across all tenants.
|
|
type: boolean
|
|
{{network.name}}NetName:
|
|
default: {{network.name_lower}}
|
|
description: The name of the {{network.name_lower}} network.
|
|
type: string
|
|
{{network.name}}SubnetName:
|
|
default: {{network.name_lower}}_subnet
|
|
description: The name of the {{network.name_lower}} subnet in Neutron.
|
|
type: string
|
|
{{network.name}}AllocationPools:
|
|
{%- if ":" in network.ip_subnet or network.ipv6 or ipv6_override %}
|
|
default: {{network.ipv6_allocation_pools|default(network.allocation_pools|default([]))}}
|
|
{%- else %}
|
|
default: {{network.allocation_pools|default([])}}
|
|
{%- endif %}
|
|
description: Ip allocation pool range for the {{network.name_lower}} network.
|
|
type: json
|
|
{%- if ":" in network.ip_subnet or network.ipv6 or ipv6_override %}
|
|
IPv6AddressMode:
|
|
default: dhcpv6-stateful
|
|
description: Neutron subnet IPv6 address mode
|
|
type: string
|
|
IPv6RAMode:
|
|
default: dhcpv6-stateful
|
|
description: Neutron subnet IPv6 router advertisement mode
|
|
type: string
|
|
{%- endif %}
|
|
{{network.name}}InterfaceDefaultRoute:
|
|
{%- if network.ipv6 or ipv6_override %}
|
|
default: "{{network.gateway_ipv6|default(network.gateway_ip|default(''))}}"
|
|
{%- else %}
|
|
default: "{{network.gateway_ip|default('')}}"
|
|
{%- endif %}
|
|
description: default route for the {{network.name_lower}} network
|
|
type: string
|
|
{%- if network.vlan %}
|
|
{{network.name}}NetworkVlanID:
|
|
default: {{network.vlan}}
|
|
description: Vlan ID for the {{network.name}} network traffic.
|
|
type: number
|
|
{%- endif %}
|
|
|
|
resources:
|
|
{{network.name}}Network:
|
|
type: OS::Neutron::Net
|
|
properties:
|
|
admin_state_up: {get_param: {{network.name}}NetAdminStateUp}
|
|
name: {get_param: {{network.name}}NetName}
|
|
shared: {get_param: {{network.name}}NetShared}
|
|
value_specs: {get_param: {{network.name}}NetValueSpecs}
|
|
|
|
{{network.name}}Subnet:
|
|
type: OS::Neutron::Subnet
|
|
properties:
|
|
{%- if ":" in network.ip_subnet or network.ipv6 or ipv6_override %}
|
|
ip_version: 6
|
|
ipv6_address_mode: {get_param: IPv6AddressMode}
|
|
ipv6_ra_mode: {get_param: IPv6RAMode}
|
|
{%- else %}
|
|
enable_dhcp: {get_param: {{network.name}}NetEnableDHCP}
|
|
{%- endif %}
|
|
cidr: {get_param: {{network.name}}NetCidr}
|
|
name: {get_param: {{network.name}}SubnetName}
|
|
network: {get_resource: {{network.name}}Network}
|
|
allocation_pools: {get_param: {{network.name}}AllocationPools}
|
|
gateway_ip: {get_param: {{network.name}}InterfaceDefaultRoute}
|
|
|
|
outputs:
|
|
OS::stack_id:
|
|
description: {{network.name_lower}} network
|
|
value: {get_resource: {{network.name}}Network}
|
|
subnet_cidr:
|
|
value: {get_attr: [{{network.name}}Subnet, cidr]}
|