diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-07-23 12:52:50 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-07-23 12:52:50 +0000 |
commit | 3b5b48cfd473cc3ab41bf6802ed1a95c5734c233 (patch) | |
tree | 7611fae94de007885e94041294b024d0aa1a68d6 /network/ports/external.yaml | |
parent | 9b5e99a56a8c2d7cbfc7e1c1e8b86dd894c55efa (diff) | |
parent | 9b89dd20162d962480d3cb84161ed6bfd4fa9de8 (diff) |
Merge "Convert PublicVirtualIP to new port creation method"
Diffstat (limited to 'network/ports/external.yaml')
-rw-r--r-- | network/ports/external.yaml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/network/ports/external.yaml b/network/ports/external.yaml index b5c1e5c9..63e3eeb3 100644 --- a/network/ports/external.yaml +++ b/network/ports/external.yaml @@ -1,7 +1,8 @@ heat_template_version: 2015-04-30 description: > - Creates a port on the external network. + Creates a port on the external network. The IP address will be chosen + automatically if FixedIPs is empty. parameters: ExternalNetName: @@ -15,6 +16,16 @@ parameters: ControlPlaneIP: # Here for compatability with noop.yaml description: IP address on the control plane type: string + ControlPlaneNetwork: # Here for compatibility with ctlplane_vip.yaml + 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: @@ -23,6 +34,7 @@ resources: properties: network: {get_param: ExternalNetName} name: {get_param: PortName} + fixed_ips: {get_param: FixedIPs} replacement_policy: AUTO outputs: |