Merge "Enable DPDK on boot using PreNetworkConfig"

[apex-tripleo-heat-templates.git] / network / tenant_v6.yaml

diff --git a/network/tenant_v6.yaml b/network/tenant_v6.yaml
index b20c952..bbc2b6b 100644 (file)
--- a/network/tenant_v6.yaml
+++ b/network/tenant_v6.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-04-30
+heat_template_version: pike
 
 description: >
   Tenant IPv6 network.
@@ -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,12 +56,13 @@ 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}
       allocation_pools: {get_param: TenantAllocationPools}
+      gateway_ip: null
 
 outputs:
   OS::stack_id: