Merge "Enable TLS configuration for containerized Galera"

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

diff --git a/network/ports/tenant_v6.yaml b/network/ports/tenant_v6.yaml
index 6ca3754..47d52d8 100644 (file)
--- a/network/ports/tenant_v6.yaml
+++ b/network/ports/tenant_v6.yaml
@@ -1,11 +1,11 @@
-heat_template_version: 2015-04-30
+heat_template_version: pike
 
 description: >
   Creates a port on the tenant network.
 
 parameters:
   TenantNetName:
-    description: Name of the tenant neutron network
+    description: The name of the tenant network.
     default: tenant
     type: string
   PortName:
@@ -52,12 +52,10 @@ outputs:
             - {get_attr: [TenantPort, 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 tenant network IP
     value:
           list_join:
             - ''
             - - {get_attr: [TenantPort, fixed_ips, 0, ip_address]}
               - '/'
-              - {get_attr: [TenantPort, subnets, 0, cidr, -2]}
-              - {get_attr: [TenantPort, subnets, 0, cidr, -1]}
+              - {str_split: ['/', {get_attr: [TenantPort, subnets, 0, cidr]}, 1]}