X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=network%2Finternal_api_v6.yaml;h=05a740b3912b632fd23272dba09f9055340db9bd;hb=38f811ca144387226dd617e01276e15f4b436b00;hp=9f5c68b2c867268b5d3d2d871c23beb98c45f9ba;hpb=55fb175bed3a020bbc5cb1c41235f0893ac43cc4;p=apex-tripleo-heat-templates.git

diff --git a/network/internal_api_v6.yaml b/network/internal_api_v6.yaml
index 9f5c68b2..05a740b3 100644
--- a/network/internal_api_v6.yaml
+++ b/network/internal_api_v6.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-04-30
+heat_template_version: pike
 
 description: >
   Internal API network. Used for most APIs, Database, RPC.
@@ -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,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: InternalApiNetCidr}
       name: {get_param: InternalApiSubnetName}
       network: {get_resource: InternalApiNetwork}
       allocation_pools: {get_param: InternalApiAllocationPools}
+      gateway_ip: null
 
 outputs:
   OS::stack_id: