summaryrefslogtreecommitdiffstats
path: root/tripleo_heat_merge
diff options
context:
space:
mode:
authorDan Sneddon <dsneddon@redhat.com>2015-06-24 14:25:08 -0700
committerDan Sneddon <dsneddon@redhat.com>2015-07-22 01:09:15 -0700
commit9b89dd20162d962480d3cb84161ed6bfd4fa9de8 (patch)
tree79c3b6799e63d75bb74fa66ff71d02af93d26626 /tripleo_heat_merge
parent53810fd7c032a33afcdc6a8baaf463f4d617bc7d (diff)
Convert PublicVirtualIP to new port creation method
This change brings PublicVirtualIP in line with the rest of the VIPs in how it is created. This allows the network where PublicVirtualIP is instantiated to be on cltplane when network isolation is not used, and on the external network when network isolation is used. This change removes the PublicVirtualNetwork parameter, since it is no longer used. In order to continue to support the PublicVirtualFixedIPs parameter, which is used to provide a specific IP for the PublicVirtualIP, the FixedIP parameter was added to cltplane_vip.yaml, vip.yaml, and noop.yaml. The value of PublicVirtualIP is passed to FixedIP in the VIP templates. This change also moves the default network for keystone public api to the external net (which will fallback to ctlplane if network isolation isn't used). Change-Id: I3f5d35cbe55d3a148e95cf49dfbaad4874df960b
Diffstat (limited to 'tripleo_heat_merge')
0 files changed, 0 insertions, 0 deletions