X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=network%2Fports%2Ftenant_v6.yaml;h=84101828d5b21d0524796e18eaae77daa372d2d8;hb=8bd9652ca23019c95c4c8360592e9acf4b89fe86;hp=6ca375492230accbe0c6faac1e33f488989eb956;hpb=b0ba9e8e09d70cb5871a6f343a698e3b481ac297;p=apex-tripleo-heat-templates.git

diff --git a/network/ports/tenant_v6.yaml b/network/ports/tenant_v6.yaml
index 6ca37549..84101828 100644
--- a/network/ports/tenant_v6.yaml
+++ b/network/ports/tenant_v6.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-04-30
+heat_template_version: ocata
 
 description: >
   Creates a port on the tenant network.
@@ -52,12 +52,10 @@ outputs:
             - {get_attr: [TenantPort, fixed_ips, 0, ip_address]}
             - ']'
   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_attr: [TenantPort, fixed_ips, 0, ip_address]}
               - '/'
-              - {get_attr: [TenantPort, subnets, 0, cidr, -2]}
-              - {get_attr: [TenantPort, subnets, 0, cidr, -1]}
+              - {str_split: ['/', {get_attr: [TenantPort, subnets, 0, cidr]}, 1]}