X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=network%2Ftenant_v6.yaml;h=b653eaf72f35b0bd83989832aec674f306ecc0ac;hb=6fabca4dafb3fe7f32fb449e406e8616a292ec5e;hp=b20c9528fe9fc2c7203b08ba829b0845538caea0;hpb=63bc11d37148b696cbb44784abeebf725778453e;p=apex-tripleo-heat-templates.git

diff --git a/network/tenant_v6.yaml b/network/tenant_v6.yaml
index b20c9528..b653eaf7 100644
--- 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
+  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,8 +56,8 @@ 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}