X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=network%2Fports%2Fstorage.yaml;h=8040041210b78a531261d5ac83432004eafa851d;hb=51a43d81acd17d36bff47b01c353f580fc2ffc03;hp=a07e5a4f9347e0df27921de1f29dabc3dc4cba8c;hpb=22b4acf454d74302f1cca03f7fe22f63619b1f70;p=apex-tripleo-heat-templates.git

diff --git a/network/ports/storage.yaml b/network/ports/storage.yaml
index a07e5a4f..80400412 100644
--- a/network/ports/storage.yaml
+++ b/network/ports/storage.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-04-30
+heat_template_version: ocata
 
 description: >
   Creates a port on the storage network.
@@ -43,13 +43,14 @@ outputs:
   ip_address:
     description: storage network IP
     value: {get_attr: [StoragePort, fixed_ips, 0, ip_address]}
+  ip_address_uri:
+    description: storage network IP (for compatibility with storage_v6.yaml)
+    value: {get_attr: [StoragePort, 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 storage network IP
     value:
           list_join:
             - ''
             - - {get_attr: [StoragePort, fixed_ips, 0, ip_address]}
               - '/'
-              - {get_attr: [StoragePort, subnets, 0, cidr, -2]}
-              - {get_attr: [StoragePort, subnets, 0, cidr, -1]}
+              - {str_split: ['/', {get_attr: [StoragePort, subnets, 0, cidr]}, 1]}