X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=network%2Fports%2Fctlplane_vip.yaml;h=7a7043bd60fa66196e7ed412a9fc325ec01c836c;hb=a558b1e08dd3f8a0bccb70344586efdd9cbfa0a5;hp=d5001e435fabe150bbc719d51ed94af7a1dcd663;hpb=7852f5da56a0a1d7b4ce2bf6f46d70700ffeea82;p=apex-tripleo-heat-templates.git

diff --git a/network/ports/ctlplane_vip.yaml b/network/ports/ctlplane_vip.yaml
index d5001e43..7a7043bd 100644
--- a/network/ports/ctlplane_vip.yaml
+++ b/network/ports/ctlplane_vip.yaml
@@ -2,8 +2,13 @@ heat_template_version: 2015-04-30
 
 description: >
   Creates a port for a VIP on the undercloud ctlplane network.
+  The IP address will be chosen automatically if FixedIPs is empty.
 
 parameters:
+  ServiceName: # Here for compatibility with from_service.yaml
+    description: Name of the service to lookup
+    default: ''
+    type: string
   NetworkName:
     description: # Here for compatibility with isolated networks
     default: ctlplane
@@ -12,22 +17,28 @@ parameters:
     description: Name of the port
     default: ''
     type: string
-  ControlPlaneIP: # Here for compatability with noop.yaml
+  ControlPlaneIP: # Here for compatibility with noop.yaml
     description: IP address on the control plane
+    default: ''
     type: string
   ControlPlaneNetwork:
     description: The name of the undercloud Neutron control plane
     default: ctlplane
     type: string
-
+  FixedIPs:
+    description: >
+        Control the IP allocation for the VIP port. E.g.
+        [{'ip_address':'1.2.3.4'}]
+    default: []
+    type: json
 
 resources:
-
   VipPort:
     type: OS::Neutron::Port
     properties:
       network: {get_param: ControlPlaneNetwork}
       name: {get_param: PortName}
+      fixed_ips: {get_param: FixedIPs}
       replacement_policy: AUTO
 
 outputs:
@@ -36,7 +47,7 @@ outputs:
     value: {get_attr: [VipPort, fixed_ips, 0, ip_address]}
   ip_subnet:
     # FIXME: this assumes a 2 digit subnet CIDR (need more heat functions?)
-    description: IP/Subnet CIDR for the internal API network IP
+    description: IP/Subnet CIDR for the ctlplane network.
     value:
           list_join:
             - ''