diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-05-04 09:37:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-05-04 09:37:37 +0000 |
| commit | ecb86f35ba971bdaa48e821a91e71a20a95b0691 (patch) | |
| tree | 6a79d3d3c1f9fe23ff40ce30982332627f3d07f7 /network/ports/tenant_from_pool_v6.yaml | |
| parent | 10dae1c697aab4b896154000687c3f40adba1e0e (diff) | |
| parent | b9bb2633c5503dc23a3316eb352f1a1ef1769289 (diff) | |
Merge "Use str_split to compute netmask in _v6 port templates"
Diffstat (limited to 'network/ports/tenant_from_pool_v6.yaml')
| -rw-r--r-- | network/ports/tenant_from_pool_v6.yaml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/network/ports/tenant_from_pool_v6.yaml b/network/ports/tenant_from_pool_v6.yaml index b2bcd426..bbe6f736 100644 --- a/network/ports/tenant_from_pool_v6.yaml +++ b/network/ports/tenant_from_pool_v6.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2015-04-30 +heat_template_version: 2015-10-15 description: > Returns an IP from a network mapped list of IPs @@ -42,12 +42,10 @@ outputs: - {get_param: [IPPool, {get_param: ExternalNetName}, {get_param: NodeIndex}]} - ']' 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_param: [IPPool, {get_param: TenantNetName}, {get_param: NodeIndex}]} - '/' - - {get_param: [TenantNetCidr, -2]} - - {get_param: [TenantNetCidr, -1]} + - {str_split: ['/', {get_attr: [TenantPort, subnets, 0, cidr]}, 1]} |