Merge "Stop and disable openstack-nova-compute service on compute nodes"

[apex-tripleo-heat-templates.git] / network / ports / internal_api_from_pool.yaml

diff --git a/network/ports/internal_api_from_pool.yaml b/network/ports/internal_api_from_pool.yaml
index b98e1fb..31c72da 100644 (file)
--- a/network/ports/internal_api_from_pool.yaml
+++ b/network/ports/internal_api_from_pool.yaml
@@ -1,18 +1,18 @@
-heat_template_version: 2015-04-30
+heat_template_version: pike
 
 description: >
   Returns an IP from a network mapped list of IPs
 
 parameters:
   InternalApiNetName:
-    description: Name of the internal API network
+    description: The name of the internal API network.
     default: internal_api
     type: string
   PortName:
     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: internal API network IP
     value: {get_param: [IPPool, {get_param: InternalApiNetName}, {get_param: NodeIndex}]}
+  ip_address_uri:
+    description: internal API network IP (for compatibility with internal_api_v6.yaml)
+    value: {get_param: [IPPool, {get_param: InternalApiNetName}, {get_param: NodeIndex}]}
   ip_subnet:
-    # FIXME: this assumes a 2 digit subnet CIDR (need more heat functions?)
     description: IP/Subnet CIDR for the internal API network IP
     value:
       list_join:
       - ''
       - - {get_param: [IPPool, {get_param: InternalApiNetName}, {get_param: NodeIndex}]}
         - '/'
-        - {get_param: [InternalApiNetCidr, -2]}
-        - {get_param: [InternalApiNetCidr, -1]}
+        - {str_split: ['/', {get_param: InternalApiNetCidr}, 1]}