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 aae12d4..94408ca 100644 (file)
--- a/network/ports/tenant.yaml
+++ b/network/ports/tenant.yaml
@@ -14,7 +14,14 @@ parameters:
     type: string
   ControlPlaneIP: # Here for compatability with noop.yaml
     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
 
 resources:
 
@@ -23,6 +30,7 @@ resources:
     properties:
       network: {get_param: TenantNetName}
       name: {get_param: PortName}
+      fixed_ips: {get_param: FixedIPs}
       replacement_policy: AUTO
 
 outputs: