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
/
tenant.yaml
diff --git
a/network/ports/tenant.yaml
b/network/ports/tenant.yaml
index
9a351a2
..
d8f78c4
100644
(file)
--- a/
network/ports/tenant.yaml
+++ b/
network/ports/tenant.yaml
@@
-1,4
+1,4
@@
-heat_template_version: 2015-
04-30
+heat_template_version: 2015-
10-15
description: >
Creates a port on the tenant network.
description: >
Creates a port on the tenant network.
@@
-12,10
+12,22
@@
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
+ FixedIPs:
+ description: >
+ Control the IP allocation for the VIP port. E.g.
+ [{'ip_address':'1.2.3.4'}]
+ default: []
+ type: json
+ IPPool: # Here for compatibility with from_pool.yaml
+ default: {}
+ type: json
+ NodeIndex: # Here for compatibility with from_pool.yaml
+ default: 0
+ type: number
resources:
resources:
@@
-24,19
+36,21
@@
resources:
properties:
network: {get_param: TenantNetName}
name: {get_param: PortName}
properties:
network: {get_param: TenantNetName}
name: {get_param: PortName}
+ fixed_ips: {get_param: FixedIPs}
replacement_policy: AUTO
outputs:
ip_address:
description: tenant network IP
value: {get_attr: [TenantPort, fixed_ips, 0, ip_address]}
replacement_policy: AUTO
outputs:
ip_address:
description: tenant network IP
value: {get_attr: [TenantPort, fixed_ips, 0, ip_address]}
+ ip_address_uri:
+ description: tenant network IP (for compatibility with tenant_v6.yaml)
+ value: {get_attr: [TenantPort, fixed_ips, 0, ip_address]}
ip_subnet:
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_attr: [TenantPort, fixed_ips, 0, ip_address]}
- '/'
description: IP/Subnet CIDR for the tenant network IP
value:
list_join:
- ''
- - {get_attr: [TenantPort, fixed_ips, 0, ip_address]}
- '/'
- - {get_attr: [TenantPort, subnets, 0, cidr, -2]}
- - {get_attr: [TenantPort, subnets, 0, cidr, -1]}
+ - {str_split: ['/', {get_attr: [TenantPort, subnets, 0, cidr]}, 1]}