X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=network%2Fports%2Ftenant.yaml;h=a56b0f431a29e054340ce437663411aeb33d1604;hb=9c1940e461867f2ce986a81fa313d7995592f0c5;hp=86c58f2f12c50618b3721c58d4d7275d1997ad91;hpb=d85635ba68e201c3ec5e42b4828e2f4291b8f080;p=apex-tripleo-heat-templates.git

diff --git a/network/ports/tenant.yaml b/network/ports/tenant.yaml
index 86c58f2f..a56b0f43 100644
--- a/network/ports/tenant.yaml
+++ b/network/ports/tenant.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-04-30
+heat_template_version: pike
 
 description: >
   Creates a port on the tenant network.
@@ -43,13 +43,14 @@ outputs:
   ip_address:
     description: tenant network IP
     value: {get_attr: [TenantPort, fixed_ips, 0, ip_address]}
+  ip_address_uri:
+    description: tenant network IP (for compatibility with tenant_v6.yaml)
+    value: {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]}