Merge "Enables increasing mariadb open files for noha deployments"

[apex-tripleo-heat-templates.git] / network / ports / from_service.yaml

diff --git a/network/ports/from_service.yaml b/network/ports/from_service.yaml
index 6b669f4..69a887e 100644 (file)
--- a/network/ports/from_service.yaml
+++ b/network/ports/from_service.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-04-30
+heat_template_version: ocata
 
 description: >
   Returns an IP from a service mapped list of IPs
@@ -8,22 +8,28 @@ parameters:
     description: Name of the service to lookup
     default: ''
     type: string
-  NetworkName: # Here for compatability with ctlplane_vip.yaml
+  NetworkName: # Here for compatibility with ctlplane_vip.yaml
     description: Name of the network where the VIP will be created
     default: ctlplane
     type: string
-  PortName: # Here for compatability with ctlplane_vip.yaml
+  PortName: # Here for compatibility with ctlplane_vip.yaml
     description: Name of the port
     default: ''
     type: string
-  ControlPlaneIP: # Here for compatability with ctlplane_vip.yaml
+  ControlPlaneIP: # Here for compatibility with ctlplane_vip.yaml
     description: IP address on the control plane
     default: ''
     type: string
-  ControlPlaneNetwork: # Here for compatability with ctlplane_vip.yaml
+  ControlPlaneNetwork: # Here for compatibility with ctlplane_vip.yaml
     description: The name of the undercloud Neutron control plane
     default: ctlplane
     type: string
+  FixedIPs: # Here for compatibility with ctlplane_vip.yaml
+    description: >
+        Control the IP allocation for the VIP port. E.g.
+        [{'ip_address':'1.2.3.4'}]
+    default: []
+    type: json
   ServiceVips:
     default: {}
     type: json
@@ -32,3 +38,6 @@ outputs:
   ip_address:
     description: network IP
     value: {get_param: [ServiceVips, {get_param: ServiceName}]}
+  ip_address_uri:
+    description: network IP (for compatibility with IPv6)
+    value: {get_param: [ServiceVips, {get_param: ServiceName}]}