Merge "Don't curl metadata server in userdata example"

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

diff --git a/network/ports/internal_api.yaml b/network/ports/internal_api.yaml
index f84e8f7..e9eb787 100644 (file)
--- a/network/ports/internal_api.yaml
+++ b/network/ports/internal_api.yaml
@@ -1,11 +1,11 @@
-heat_template_version: 2015-04-30
+heat_template_version: pike
 
 description: >
   Creates a port on the internal_api network.
 
 parameters:
   InternalApiNetName:
-    description: Name of the internal API neutron network
+    description: The name of the internal API network.
     default: internal_api
     type: string
   PortName:
@@ -43,13 +43,15 @@ outputs:
   ip_address:
     description: internal API network IP
     value: {get_attr: [InternalApiPort, fixed_ips, 0, ip_address]}
+  ip_address_uri:
+    description: |
+        internal API network IP (for compatibility with internal_api_v6.yaml)
+    value: {get_attr: [InternalApiPort, 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 internal API network IP
     value:
           list_join:
             - ''
             - - {get_attr: [InternalApiPort, fixed_ips, 0, ip_address]}
               - '/'
-              - {get_attr: [InternalApiPort, subnets, 0, cidr, -2]}
-              - {get_attr: [InternalApiPort, subnets, 0, cidr, -1]}
+              - {str_split: ['/', {get_attr: [InternalApiPort, subnets, 0, cidr]}, 1]}