Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Enable Manila integration - as a composable controller service"
[apex-tripleo-heat-templates.git]
/
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
966d96a
..
328f838
100644
(file)
--- 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
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:
- {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}]}
- '/'
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]}