X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=network%2Fports%2Ftenant_from_pool_v6.yaml;h=bbe6f736b7825b0d466cfad252838fe3c3223229;hb=81d3b5855775d7aafe3f165a74bfb9330c45fb7c;hp=b2bcd426ab449b19e3ccf1a74d6632d7588b3e4f;hpb=91c5c470890f1716e70ca50a72ff7431e6fac08a;p=apex-tripleo-heat-templates.git

diff --git a/network/ports/tenant_from_pool_v6.yaml b/network/ports/tenant_from_pool_v6.yaml
index b2bcd426..bbe6f736 100644
--- a/network/ports/tenant_from_pool_v6.yaml
+++ b/network/ports/tenant_from_pool_v6.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-04-30
+heat_template_version: 2015-10-15
 
 description: >
   Returns an IP from a network mapped list of IPs
@@ -42,12 +42,10 @@ outputs:
             - {get_param: [IPPool, {get_param: ExternalNetName}, {get_param: NodeIndex}]}
             - ']'
   ip_subnet:
-    # FIXME: this assumes a 2 digit subnet CIDR (need more heat functions?)
     description: IP/Subnet CIDR for the tenant network IP
     value:
       list_join:
       - ''
       - - {get_param: [IPPool, {get_param: TenantNetName}, {get_param: NodeIndex}]}
         - '/'
-        - {get_param: [TenantNetCidr, -2]}
-        - {get_param: [TenantNetCidr, -1]}
+        - {str_split: ['/', {get_attr: [TenantPort, subnets, 0, cidr]}, 1]}