From 7981f69c034c5d08abade7f62161aeec65045814 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Fri, 22 Jan 2016 10:47:34 +0100 Subject: 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 --- network/tenant_v6.yaml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'network/tenant_v6.yaml') diff --git a/network/tenant_v6.yaml b/network/tenant_v6.yaml index b20c9528..b653eaf7 100644 --- a/network/tenant_v6.yaml +++ b/network/tenant_v6.yaml @@ -34,6 +34,14 @@ parameters: 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. 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: TenantNetwork: @@ -48,8 +56,8 @@ resources: type: OS::Neutron::Subnet properties: ip_version: 6 - ipv6_address_mode: slaac - ipv6_ra_mode: slaac + ipv6_address_mode: {get_param: IPv6AddressMode} + ipv6_ra_mode: {get_param: IPv6RAMode} cidr: {get_param: TenantNetCidr} name: {get_param: TenantSubnetName} network: {get_resource: TenantNetwork} -- cgit 1.2.3-korg