diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-27 02:24:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-27 02:24:00 +0000 |
| commit | d19cf051ea9581a16b4a638708e7e32049144bef (patch) | |
| tree | 2bf002a16280d9f49e32de4e7cd7b1960ac9e8c1 | |
| parent | fb8338ec245954d3f707173f34053ed50ac5d994 (diff) | |
| parent | 0de495b4f69e7f9de70fac55615b964311614e80 (diff) | |
Merge "Add FixedIPs parameter to from_service.yaml"
| -rw-r--r-- | network/ports/from_service.yaml | 6 | ||||
| -rw-r--r-- | network/ports/from_service_v6.yaml | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/network/ports/from_service.yaml b/network/ports/from_service.yaml index 3d61910e..782b6b07 100644 --- a/network/ports/from_service.yaml +++ b/network/ports/from_service.yaml @@ -24,6 +24,12 @@ parameters: 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 diff --git a/network/ports/from_service_v6.yaml b/network/ports/from_service_v6.yaml index 2dd0a0ee..80060b57 100644 --- a/network/ports/from_service_v6.yaml +++ b/network/ports/from_service_v6.yaml @@ -24,6 +24,12 @@ parameters: 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 |