diff options
| author |   Steven Hardy <shardy@redhat.com> | 2016-01-12 08:56:21 +0000 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2016-01-12 08:56:21 +0000 |
| commit | de4cb0c280264bd66e7258091bd387226dd55585 (patch) | |
| tree | 7b9338801418c7f5be8c16fb70e62f08f690f5a4 /network/ports/ctlplane_vip.yaml | |
| parent | 31b05b17bfd028d16990231079c4bfde777cde40 (diff) | |
Convert port cidr splitting to str_split
Previously we used an interim workaround which required a 2 digit subnet
but now heat (as of liberty) has str_split, which was implemented for this
purpose.
Change-Id: I29bb5f407b717e26a09c8c661954ee07fff72d71
Diffstat (limited to 'network/ports/ctlplane_vip.yaml')
| -rw-r--r-- | network/ports/ctlplane_vip.yaml | 6 |
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]} |