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 "Add constraint to prohibit balance-tcp from BondInterfaceOvsOptions"
[apex-tripleo-heat-templates.git]
/
network
/
ports
/
external_from_pool.yaml
diff --git
a/network/ports/external_from_pool.yaml
b/network/ports/external_from_pool.yaml
index
8e9dc7c
..
867176e
100644
(file)
--- a/
network/ports/external_from_pool.yaml
+++ b/
network/ports/external_from_pool.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
description: >
Returns an IP from a network mapped list of IPs
@@
-12,7
+12,7
@@
parameters:
description: Name of the port
default: ''
type: string
description: Name of the port
default: ''
type: string
- ControlPlaneIP: # Here for compat
a
bility with noop.yaml
+ ControlPlaneIP: # Here for compat
i
bility with noop.yaml
description: IP address on the control plane
default: ''
type: string
description: IP address on the control plane
default: ''
type: string
@@
-33,13
+33,14
@@
outputs:
ip_address:
description: external network IP
value: {get_param: [IPPool, {get_param: ExternalNetName}, {get_param: NodeIndex}]}
ip_address:
description: external network IP
value: {get_param: [IPPool, {get_param: ExternalNetName}, {get_param: NodeIndex}]}
+ ip_address_uri:
+ description: external network IP (for compatibility with IPv6)
+ value: {get_param: [IPPool, {get_param: ExternalNetName}, {get_param: NodeIndex}]}
ip_subnet:
ip_subnet:
- # FIXME: this assumes a 2 digit subnet CIDR (need more heat functions?)
description: IP/Subnet CIDR for the external network IP
value:
list_join:
- ''
- - {get_param: [IPPool, {get_param: ExternalNetName}, {get_param: NodeIndex}]}
- '/'
description: IP/Subnet CIDR for the external network IP
value:
list_join:
- ''
- - {get_param: [IPPool, {get_param: ExternalNetName}, {get_param: NodeIndex}]}
- '/'
- - {get_param: [ExternalNetCidr, -2]}
- - {get_param: [ExternalNetCidr, -1]}
+ - {str_split: ['/', {get_param: ExternalNetCidr}, 1]}