summaryrefslogtreecommitdiffstats
path: root/network/ports/ctlplane_vip.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-29 20:56:04 +0000
committerGerrit Code Review <review@openstack.org>2016-02-29 20:56:04 +0000
commitfef01919e67e59f2ba0dc9d5b1ec5567dc9daabf (patch)
tree0b7c05481c9e5c79790c3d2478b0ef8b22ec93dd /network/ports/ctlplane_vip.yaml
parent6677663e1141c1baabb0769191a7f951abe0c66d (diff)
parentde4cb0c280264bd66e7258091bd387226dd55585 (diff)
Merge "Convert port cidr splitting to str_split"
Diffstat (limited to 'network/ports/ctlplane_vip.yaml')
-rw-r--r--network/ports/ctlplane_vip.yaml6
1 files changed, 2 insertions, 4 deletions
diff --git a/network/ports/ctlplane_vip.yaml b/network/ports/ctlplane_vip.yaml
index 7a7043bd..1d8b2916 100644
--- a/network/ports/ctlplane_vip.yaml
+++ b/network/ports/ctlplane_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 undercloud ctlplane network.
@@ -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 ctlplane network.
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]}