Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Move AllNodesValidationDeployments into jinja template loop"
[apex-tripleo-heat-templates.git]
/
network
/
external_v6.yaml
diff --git
a/network/external_v6.yaml
b/network/external_v6.yaml
index
cfbe94c
..
3e120f2
100644
(file)
--- a/
network/external_v6.yaml
+++ b/
network/external_v6.yaml
@@
-34,6
+34,14
@@
parameters:
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.
type: json
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.
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:
ExternalNetwork:
resources:
ExternalNetwork:
@@
-48,8
+56,8
@@
resources:
type: OS::Neutron::Subnet
properties:
ip_version: 6
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: ExternalNetCidr}
name: {get_param: ExternalSubnetName}
network: {get_resource: ExternalNetwork}
cidr: {get_param: ExternalNetCidr}
name: {get_param: ExternalSubnetName}
network: {get_resource: ExternalNetwork}