From b9bb2633c5503dc23a3316eb352f1a1ef1769289 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Mon, 18 Apr 2016 18:51:11 +0200 Subject: Use str_split to compute netmask in _v6 port templates Change-Id: I282dbc025500b1628d4f08a49b54a2adefd38b5f --- network/ports/storage_from_pool_v6.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'network/ports/storage_from_pool_v6.yaml') diff --git a/network/ports/storage_from_pool_v6.yaml b/network/ports/storage_from_pool_v6.yaml index 966d96ae..328f8385 100644 --- a/network/ports/storage_from_pool_v6.yaml +++ b/network/ports/storage_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. This version is for IPv6 @@ -43,12 +43,10 @@ outputs: - {get_param: [IPPool, {get_param: StorageNetName}, {get_param: NodeIndex}]} - ']' ip_subnet: - # FIXME: this assumes a 2 digit subnet CIDR (need more heat functions?) description: IP/Subnet CIDR for the storage network IP value: list_join: - '' - - {get_param: [IPPool, {get_param: StorageNetName}, {get_param: NodeIndex}]} - '/' - - {get_param: [StorageNetCidr, -2]} - - {get_param: [StorageNetCidr, -1]} + - {str_split: ['/', {get_attr: [StoragePort, subnets, 0, cidr]}, 1]} -- cgit 1.2.3-korg