X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=network%2Fports%2Ftenant_from_pool.yaml;h=d5fd70801940c11ef701bb54f0774b25c06a748a;hb=765aef08425578a15b5949bdc2866c7d7358a87d;hp=29303bb69d4ee2d83baf9140ded606114e48f225;hpb=795e4290dd6b12a8f4b7c6932a3777a036195081;p=apex-tripleo-heat-templates.git

diff --git a/network/ports/tenant_from_pool.yaml b/network/ports/tenant_from_pool.yaml
index 29303bb6..d5fd7080 100644
--- a/network/ports/tenant_from_pool.yaml
+++ b/network/ports/tenant_from_pool.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
@@ -12,7 +12,7 @@ parameters:
     description: Name of the port
     default: ''
     type: string
-  ControlPlaneIP: # Here for compatability with noop.yaml
+  ControlPlaneIP: # Here for compatibility with noop.yaml
     description: IP address on the control plane
     default: ''
     type: string
@@ -33,13 +33,14 @@ outputs:
   ip_address:
     description: tenant network IP
     value: {get_param: [IPPool, {get_param: TenantNetName}, {get_param: NodeIndex}]}
+  ip_address_uri:
+    description: tenant network IP (for compatibility with tenant_v6.yaml)
+    value: {get_param: [IPPool, {get_param: TenantNetName}, {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_param: TenantNetCidr}, 1]}