X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=network%2Fexternal_v6.yaml;h=51000bb76e1a7e7ad3e19bb537b7307b765cb9ce;hb=8514fb649ab008bd8cf2da05ce6b44542a3aedae;hp=cfbe94c33844092b3991396c07f57f9617c684e9;hpb=321e605a0a4c219415a3876a84fa063410380cac;p=apex-tripleo-heat-templates.git

diff --git a/network/external_v6.yaml b/network/external_v6.yaml
index cfbe94c3..51000bb7 100644
--- a/network/external_v6.yaml
+++ b/network/external_v6.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-04-30
+heat_template_version: ocata
 
 description: >
   External network. Public traffic, Neutron l3router for floating IPs/SNAT, etc.
@@ -34,6 +34,18 @@ 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
+  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
+  ExternalInterfaceDefaultRoute:
+    default: '2001:db8:fd00:1000::1'
+    description: default route for the external network
+    type: string
 
 resources:
   ExternalNetwork:
@@ -48,12 +60,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: ExternalNetCidr}
       name: {get_param: ExternalSubnetName}
       network: {get_resource: ExternalNetwork}
       allocation_pools: {get_param: ExternalAllocationPools}
+      gateway_ip: {get_param: ExternalInterfaceDefaultRoute}
 
 outputs:
   OS::stack_id: