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 "Minor fixes to TLS related resources"
[apex-tripleo-heat-templates.git]
/
network
/
ports
/
tenant.yaml
diff --git
a/network/ports/tenant.yaml
b/network/ports/tenant.yaml
index
1957c41
..
94408ca
100644
(file)
--- a/
network/ports/tenant.yaml
+++ b/
network/ports/tenant.yaml
@@
-8,9
+8,20
@@
parameters:
description: Name of the tenant neutron network
default: tenant
type: string
description: Name of the tenant neutron network
default: tenant
type: string
+ PortName:
+ description: Name of the port
+ default: ''
+ type: string
ControlPlaneIP: # Here for compatability with noop.yaml
description: IP address on the control plane
ControlPlaneIP: # Here for compatability with noop.yaml
description: IP address on the control plane
+ default: ''
type: string
type: string
+ FixedIPs:
+ description: >
+ Control the IP allocation for the VIP port. E.g.
+ [{'ip_address':'1.2.3.4'}]
+ default: []
+ type: json
resources:
resources:
@@
-18,6
+29,8
@@
resources:
type: OS::Neutron::Port
properties:
network: {get_param: TenantNetName}
type: OS::Neutron::Port
properties:
network: {get_param: TenantNetName}
+ name: {get_param: PortName}
+ fixed_ips: {get_param: FixedIPs}
replacement_policy: AUTO
outputs:
replacement_policy: AUTO
outputs: