X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=network%2Fports%2Fmanagement.yaml;h=b626bc20709be4a8792310695e014569cab90e40;hb=3cce9cfa072ce343f6b203e4f1bb7dbd12622c92;hp=1d15ca60205528022fb3c5654732f4e6b9e31db6;hpb=15bb67261a333f140f21208e20a112b99eeb609c;p=apex-tripleo-heat-templates.git

diff --git a/network/ports/management.yaml b/network/ports/management.yaml
index 1d15ca60..b626bc20 100644
--- a/network/ports/management.yaml
+++ b/network/ports/management.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-04-30
+heat_template_version: ocata
 
 description: >
   Creates a port on the management network. The IP address will be chosen
@@ -16,6 +16,12 @@ parameters:
   ControlPlaneIP: # Here for compatibility with noop.yaml
     description: IP address on the control plane
     type: string
+  IPPool: # Here for compatibility with from_pool.yaml
+    default: {}
+    type: json
+  NodeIndex: # Here for compatibility with from_pool.yaml
+    default: 0
+    type: number
 
 resources:
 
@@ -30,13 +36,14 @@ outputs:
   ip_address:
     description: management network IP
     value: {get_attr: [ManagementPort, fixed_ips, 0, ip_address]}
+  ip_address_uri:
+    description: management network IP (for compatibility with management_v6.yaml)
+    value: {get_attr: [ManagementPort, 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 management network IP
     value:
           list_join:
             - ''
             - - {get_attr: [ManagementPort, fixed_ips, 0, ip_address]}
               - '/'
-              - {get_attr: [ManagementPort, subnets, 0, cidr, -2]}
-              - {get_attr: [ManagementPort, subnets, 0, cidr, -1]}
+              - {str_split: ['/', {get_attr: [ManagementPort, subnets, 0, cidr]}, 1]}