Make many networking parameters consistent

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

diff --git a/network/ports/noop.yaml b/network/ports/noop.yaml
index ac946cd..9f39c4f 100644 (file)
--- a/network/ports/noop.yaml
+++ b/network/ports/noop.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-04-30
+heat_template_version: pike
 
 description: >
   Returns the control plane port (provisioning network) as the ip_address.
@@ -12,19 +12,21 @@ parameters:
     description: IP address on the control plane
     type: string
   ControlPlaneNetwork:
-    description: Name of the control plane network
+    description: The name of the undercloud Neutron control plane
     default: ctlplane
     type: string
   PortName:
     description: Name of the port
     default: ''
     type: string
-  NetworkName:
-    description: # Here for compatibility with vip.yaml
-    default: ''
+  NetworkName: # Here for compatibility with vip.yaml
+    description: Name of the network where the VIP will be created
+    default: ctlplane
     type: string
   FixedIPs:
-    description: # Here for compatibility with vip.yaml
+    description: >
+        Control the IP allocation for the VIP port. E.g.
+        [{'ip_address':'1.2.3.4'}]
     default: []
     type: json
   ControlPlaneSubnetCidr: # Override this via parameter_defaults
@@ -44,6 +46,9 @@ outputs:
   ip_address:
     description: pass thru network IP
     value: {get_param: ControlPlaneIP}
+  ip_address_uri:
+    description: pass thru network IP (for compatibility with vip_v6.yaml)
+    value: {get_param: ControlPlaneIP}
   ip_subnet:
     description: IP/Subnet CIDR for the pass thru network IP
     value: