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 "scenario002/container: run Barbican non-containerized"
[apex-tripleo-heat-templates.git]
/
network
/
ports
/
storage_v6.yaml
diff --git
a/network/ports/storage_v6.yaml
b/network/ports/storage_v6.yaml
index
13b6227
..
c7d47c5
100644
(file)
--- a/
network/ports/storage_v6.yaml
+++ b/
network/ports/storage_v6.yaml
@@
-1,11
+1,11
@@
-heat_template_version:
2015-04-30
+heat_template_version:
pike
description: >
Creates a port on the storage network.
parameters:
StorageNetName:
description: >
Creates a port on the storage network.
parameters:
StorageNetName:
- description:
Name of the storage neutron network
+ description:
The name of the storage network.
default: storage
type: string
PortName:
default: storage
type: string
PortName:
@@
-52,12
+52,10
@@
outputs:
- {get_attr: [StoragePort, fixed_ips, 0, ip_address]}
- ']'
ip_subnet:
- {get_attr: [StoragePort, 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 storage network IP
value:
list_join:
- ''
- - {get_attr: [StoragePort, fixed_ips, 0, ip_address]}
- '/'
description: IP/Subnet CIDR for the storage network IP
value:
list_join:
- ''
- - {get_attr: [StoragePort, fixed_ips, 0, ip_address]}
- '/'
- - {get_attr: [StoragePort, subnets, 0, cidr, -2]}
- - {get_attr: [StoragePort, subnets, 0, cidr, -1]}
+ - {str_split: ['/', {get_attr: [StoragePort, subnets, 0, cidr]}, 1]}