Enables auto-detection for VIP interfaces
Previously the ctrl plane VIP would default to 'br-ex' which in non-vlan
deployments ends up being the wrong interface. The public VIP interface
was also defaulted to 'br-ex' which would be incorrect for vlan based
deployments. Since a user has already given the nic template (and in
most cases the subnet that corresponds to the nic) the installer should
be able to figure out which interface the public/control vip should be
on.
These changes enable that type of auto-detection, unless a user
explicitly overrides the heat parameters for ControlVirtualInterface and
PublicVirtualInterface. Also, incorrect parameters from haproxy service
are removed.
Depends-On: I05105fce85be8ace986db351cdca2916f405ed04
Closes-Bug: 1606632
Change-Id: I3c1c39824ec32ced304a782edc6ef49c0769c108
Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit f49d4d23f6
)
This commit is contained in:
parent
91dd21c803
commit
b45387c273
|
@ -34,16 +34,6 @@ parameters:
|
|||
description: The password for Redis
|
||||
type: string
|
||||
hidden: true
|
||||
ControlVirtualInterface:
|
||||
default: 'br-ex'
|
||||
description: Interface where virtual ip will be assigned.
|
||||
type: string
|
||||
PublicVirtualInterface:
|
||||
default: 'br-ex'
|
||||
description: >
|
||||
Specifies the interface where the public-facing virtual ip will be assigned.
|
||||
This should be int_public when a VLAN is being used.
|
||||
type: string
|
||||
MonitoringSubscriptionHaproxy:
|
||||
default: 'overcloud-haproxy'
|
||||
type: string
|
||||
|
@ -62,7 +52,5 @@ outputs:
|
|||
tripleo::haproxy::haproxy_stats_user: {get_param: HAProxyStatsUser}
|
||||
tripleo::haproxy::haproxy_stats_password: {get_param: HAProxyStatsPassword}
|
||||
tripleo::haproxy::redis_password: {get_param: RedisPassword}
|
||||
tripleo::haproxy::control_virtual_interface: {get_param: ControlVirtualInterface}
|
||||
tripleo::haproxy::public_virtual_interface: {get_param: PublicVirtualInterface}
|
||||
step_config: |
|
||||
include ::tripleo::profile::base::haproxy
|
||||
|
|
|
@ -19,14 +19,18 @@ parameters:
|
|||
via parameter_defaults in the resource registry.
|
||||
type: json
|
||||
ControlVirtualInterface:
|
||||
default: 'br-ex'
|
||||
description: Interface where virtual ip will be assigned.
|
||||
default: ''
|
||||
description: >
|
||||
Interface where virtual ip will be assigned. This value will be
|
||||
automatically set by the deployment tool. Overriding here will
|
||||
override automatic setting.
|
||||
type: string
|
||||
PublicVirtualInterface:
|
||||
default: 'br-ex'
|
||||
default: ''
|
||||
description: >
|
||||
Specifies the interface where the public-facing virtual ip will be assigned.
|
||||
This should be int_public when a VLAN is being used.
|
||||
Interface where virtual ip will be assigned. This value will be
|
||||
automatically set by the deployment tool. Overriding here will
|
||||
override automatic setting.
|
||||
type: string
|
||||
MonitoringSubscriptionKeepalived:
|
||||
default: 'overcloud-keepalived'
|
||||
|
|
Loading…
Reference in New Issue