diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-07 14:52:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-07 14:52:56 +0000 |
| commit | f352773cf37027724ea0252bd18a8ab3fe7b99e9 (patch) | |
| tree | a5b0716cda84f83b245fdd6cdfbfd9d970954f17 /network/internal_api_v6.yaml | |
| parent | 582a3115f744af151f4cd36a5ad0ac3e8ef09a7f (diff) | |
| parent | 7981f69c034c5d08abade7f62161aeec65045814 (diff) | |
Merge "Make the Neutron subnet ipv6_{ra,address}_mode configurable"
Diffstat (limited to 'network/internal_api_v6.yaml')
| -rw-r--r-- | network/internal_api_v6.yaml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/network/internal_api_v6.yaml b/network/internal_api_v6.yaml index 9f5c68b2..68c14fbe 100644 --- a/network/internal_api_v6.yaml +++ b/network/internal_api_v6.yaml @@ -34,6 +34,14 @@ parameters: 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. 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: InternalApiNetwork: @@ -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: InternalApiNetCidr} name: {get_param: InternalApiSubnetName} network: {get_resource: InternalApiNetwork} |