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
Add simple parameter test to yaml-validate.py
[apex-tripleo-heat-templates.git]
/
network
/
tenant_v6.yaml
diff --git
a/network/tenant_v6.yaml
b/network/tenant_v6.yaml
index
b20c952
..
b653eaf
100644
(file)
--- 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
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:
resources:
TenantNetwork:
@@
-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: TenantNetCidr}
name: {get_param: TenantSubnetName}
network: {get_resource: TenantNetwork}
cidr: {get_param: TenantNetCidr}
name: {get_param: TenantSubnetName}
network: {get_resource: TenantNetwork}