Make the Neutron subnet ipv6_{ra,address}_mode configurable
Use of slaac does not permit stati assignment of IPs to a Neutron port, so we default to dhcpv6-stateful instead. Change-Id: Id7f104be60ae05785a3d0a33516d7875a4698ed1
This commit is contained in:
parent
365c35cc6e
commit
7981f69c03
|
@ -34,6 +34,14 @@ parameters:
|
||||||
default: [{'start': '2001:db8:fd00:1000::10', 'end': '2001:db8:fd00:1000:ffff:ffff:ffff:fffe'}]
|
default: [{'start': '2001:db8:fd00:1000::10', 'end': '2001:db8:fd00:1000:ffff:ffff:ffff:fffe'}]
|
||||||
description: Ip allocation pool range for the external network.
|
description: Ip allocation pool range for the external network.
|
||||||
type: json
|
type: json
|
||||||
|
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
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
ExternalNetwork:
|
ExternalNetwork:
|
||||||
|
@ -48,8 +56,8 @@ resources:
|
||||||
type: OS::Neutron::Subnet
|
type: OS::Neutron::Subnet
|
||||||
properties:
|
properties:
|
||||||
ip_version: 6
|
ip_version: 6
|
||||||
ipv6_address_mode: slaac
|
ipv6_address_mode: {get_param: IPv6AddressMode}
|
||||||
ipv6_ra_mode: slaac
|
ipv6_ra_mode: {get_param: IPv6RAMode}
|
||||||
cidr: {get_param: ExternalNetCidr}
|
cidr: {get_param: ExternalNetCidr}
|
||||||
name: {get_param: ExternalSubnetName}
|
name: {get_param: ExternalSubnetName}
|
||||||
network: {get_resource: ExternalNetwork}
|
network: {get_resource: ExternalNetwork}
|
||||||
|
|
|
@ -34,6 +34,14 @@ parameters:
|
||||||
default: [{'start': 'fd00:fd00:fd00:2000::10', 'end': 'fd00:fd00:fd00:2000:ffff:ffff:ffff:fffe'}]
|
default: [{'start': 'fd00:fd00:fd00:2000::10', 'end': 'fd00:fd00:fd00:2000:ffff:ffff:ffff:fffe'}]
|
||||||
description: Ip allocation pool range for the internal API network.
|
description: Ip allocation pool range for the internal API network.
|
||||||
type: json
|
type: json
|
||||||
|
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
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
InternalApiNetwork:
|
InternalApiNetwork:
|
||||||
|
@ -48,8 +56,8 @@ resources:
|
||||||
type: OS::Neutron::Subnet
|
type: OS::Neutron::Subnet
|
||||||
properties:
|
properties:
|
||||||
ip_version: 6
|
ip_version: 6
|
||||||
ipv6_address_mode: slaac
|
ipv6_address_mode: {get_param: IPv6AddressMode}
|
||||||
ipv6_ra_mode: slaac
|
ipv6_ra_mode: {get_param: IPv6RAMode}
|
||||||
cidr: {get_param: InternalApiNetCidr}
|
cidr: {get_param: InternalApiNetCidr}
|
||||||
name: {get_param: InternalApiSubnetName}
|
name: {get_param: InternalApiSubnetName}
|
||||||
network: {get_resource: InternalApiNetwork}
|
network: {get_resource: InternalApiNetwork}
|
||||||
|
|
|
@ -34,6 +34,14 @@ parameters:
|
||||||
default: [{'start': 'fd00:fd00:fd00:4000::10', 'end': 'fd00:fd00:fd00:4000:ffff:ffff:ffff:fffe'}]
|
default: [{'start': 'fd00:fd00:fd00:4000::10', 'end': 'fd00:fd00:fd00:4000:ffff:ffff:ffff:fffe'}]
|
||||||
description: Ip allocation pool range for the storage mgmt network.
|
description: Ip allocation pool range for the storage mgmt network.
|
||||||
type: json
|
type: json
|
||||||
|
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
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
StorageMgmtNetwork:
|
StorageMgmtNetwork:
|
||||||
|
@ -48,8 +56,8 @@ resources:
|
||||||
type: OS::Neutron::Subnet
|
type: OS::Neutron::Subnet
|
||||||
properties:
|
properties:
|
||||||
ip_version: 6
|
ip_version: 6
|
||||||
ipv6_address_mode: slaac
|
ipv6_address_mode: {get_param: IPv6AddressMode}
|
||||||
ipv6_ra_mode: slaac
|
ipv6_ra_mode: {get_param: IPv6RAMode}
|
||||||
cidr: {get_param: StorageMgmtNetCidr}
|
cidr: {get_param: StorageMgmtNetCidr}
|
||||||
name: {get_param: StorageMgmtSubnetName}
|
name: {get_param: StorageMgmtSubnetName}
|
||||||
network: {get_resource: StorageMgmtNetwork}
|
network: {get_resource: StorageMgmtNetwork}
|
||||||
|
|
|
@ -34,6 +34,14 @@ parameters:
|
||||||
default: [{'start': 'fd00:fd00:fd00:3000::10', 'end': 'fd00:fd00:fd00:3000:ffff:ffff:ffff:fffe'}]
|
default: [{'start': 'fd00:fd00:fd00:3000::10', 'end': 'fd00:fd00:fd00:3000:ffff:ffff:ffff:fffe'}]
|
||||||
description: Ip allocation pool range for the storage network.
|
description: Ip allocation pool range for the storage network.
|
||||||
type: json
|
type: json
|
||||||
|
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
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
StorageNetwork:
|
StorageNetwork:
|
||||||
|
@ -48,8 +56,8 @@ resources:
|
||||||
type: OS::Neutron::Subnet
|
type: OS::Neutron::Subnet
|
||||||
properties:
|
properties:
|
||||||
ip_version: 6
|
ip_version: 6
|
||||||
ipv6_address_mode: slaac
|
ipv6_address_mode: {get_param: IPv6AddressMode}
|
||||||
ipv6_ra_mode: slaac
|
ipv6_ra_mode: {get_param: IPv6RAMode}
|
||||||
cidr: {get_param: StorageNetCidr}
|
cidr: {get_param: StorageNetCidr}
|
||||||
name: {get_param: StorageSubnetName}
|
name: {get_param: StorageSubnetName}
|
||||||
network: {get_resource: StorageNetwork}
|
network: {get_resource: StorageNetwork}
|
||||||
|
|
|
@ -34,6 +34,14 @@ parameters:
|
||||||
default: [{'start': 'fd00:fd00:fd00:5000::10', 'end': 'fd00:fd00:fd00:5000:ffff:ffff:ffff:fffe'}]
|
default: [{'start': 'fd00:fd00:fd00:5000::10', 'end': 'fd00:fd00:fd00:5000:ffff:ffff:ffff:fffe'}]
|
||||||
description: Ip allocation pool range for the tenant network.
|
description: Ip allocation pool range for the tenant network.
|
||||||
type: json
|
type: json
|
||||||
|
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
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
TenantNetwork:
|
TenantNetwork:
|
||||||
|
@ -48,8 +56,8 @@ resources:
|
||||||
type: OS::Neutron::Subnet
|
type: OS::Neutron::Subnet
|
||||||
properties:
|
properties:
|
||||||
ip_version: 6
|
ip_version: 6
|
||||||
ipv6_address_mode: slaac
|
ipv6_address_mode: {get_param: IPv6AddressMode}
|
||||||
ipv6_ra_mode: slaac
|
ipv6_ra_mode: {get_param: IPv6RAMode}
|
||||||
cidr: {get_param: TenantNetCidr}
|
cidr: {get_param: TenantNetCidr}
|
||||||
name: {get_param: TenantSubnetName}
|
name: {get_param: TenantSubnetName}
|
||||||
network: {get_resource: TenantNetwork}
|
network: {get_resource: TenantNetwork}
|
||||||
|
|
Loading…
Reference in New Issue