Merge "Use set -e for validation-scripts/all-nodes.sh"

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

diff --git a/network/ports/vip.yaml b/network/ports/vip.yaml
index 9bb6cde..fb25199 100644 (file)
--- a/network/ports/vip.yaml
+++ b/network/ports/vip.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-04-30
+heat_template_version: 2015-10-15
 
 description: >
   Creates a port for a VIP on the isolated network NetworkName.
@@ -46,12 +46,10 @@ outputs:
     description: Virtual IP network IP
     value: {get_attr: [VipPort, 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 network associated with this IP
     value:
           list_join:
             - ''
             - - {get_attr: [VipPort, fixed_ips, 0, ip_address]}
               - '/'
-              - {get_attr: [VipPort, subnets, 0, cidr, -2]}
-              - {get_attr: [VipPort, subnets, 0, cidr, -1]}
+              - {str_split: ['/', {get_attr: [VipPort, subnets, 0, cidr]}, 1]}