diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-02-29 20:56:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-02-29 20:56:04 +0000 |
| commit | fef01919e67e59f2ba0dc9d5b1ec5567dc9daabf (patch) | |
| tree | 0b7c05481c9e5c79790c3d2478b0ef8b22ec93dd /network/ports/internal_api.yaml | |
| parent | 6677663e1141c1baabb0769191a7f951abe0c66d (diff) | |
| parent | de4cb0c280264bd66e7258091bd387226dd55585 (diff) | |
Merge "Convert port cidr splitting to str_split"
Diffstat (limited to 'network/ports/internal_api.yaml')
| -rw-r--r-- | network/ports/internal_api.yaml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/network/ports/internal_api.yaml b/network/ports/internal_api.yaml index f84e8f71..4039f9d7 100644 --- a/network/ports/internal_api.yaml +++ b/network/ports/internal_api.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2015-04-30 +heat_template_version: 2015-10-15 description: > Creates a port on the internal_api network. @@ -44,12 +44,10 @@ outputs: description: internal API network IP 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]} |