diff options
| author |   Robert Collins <rbtcollins@hp.com> | 2014-06-30 16:53:25 +1200 |
|---|---|---|
| committer |   Dan Prince <dprince@redhat.com> | 2014-08-28 13:34:38 -0400 |
| commit | 91e763f748e098b6c1fc13dc63fb1e612b36a64f (patch) | |
| tree | b65d30b48f2afbc07496b315e4bc5add3498ab8d /undercloud-source.yaml | |
| parent | 91fd462aae986746296d6ca3065514f8a0676b66 (diff) | |
Expose public_interface_tag support.
Proper VLAN support requires adding the IP address to a new device,
rather than br-ex/br-ctlplane. This is added in the
tripleo-image-elements change https://review.openstack.org/103449
(I3f77f72ac623792e844dbb4d501b6ab269141f8e) and here we just expose
it with appropriate glue to get the IP address from Neutron.
With this we can now describe a VLAN public interface scenario
to the undercloud and overcloud control planes.
Change-Id: I4d2194fc813aebb0708d6fddf4f05bae5f091fd8
Diffstat (limited to 'undercloud-source.yaml')
| -rw-r--r-- | undercloud-source.yaml | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/undercloud-source.yaml b/undercloud-source.yaml index e09b3db5..40dbd890 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -134,7 +134,18 @@ parameters: type: string NeutronPublicInterfaceIP: default: '' - description: A custom IP address to put onto the NeutronPublicInterface. + description: | + A custom IP address to put onto the NeutronPublicInterface bridge. + See also NeutronPublicInterfaceTagIP for adding a VLAN tagging IP. + NeutronPublicInterfaceIP is deprecated in the context of deploying + underclouds - its only needed for the seed bootstrap process. + type: string + NeutronPublicInterfaceTag: + default: '' + description: | + VLAN tag for creating a public VLAN. The tag will be used to + create an access port on the exterior bridge, and that port will be + given the IP address returned by neutron from the public network. type: string NeutronPublicInterfaceRawDevice: default: '' @@ -280,6 +291,8 @@ resources: get_param: NeutronPublicInterfaceRawDevice public_interface_route: get_param: NeutronPublicInterfaceDefaultRoute + public_interface_tag: + get_param: NeutronPublicInterfaceTag physical_bridge: br-ctlplane physical_network: ctlplane network_vlan_ranges: ctlplane |