f49d4d23f6
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>
53 lines
1.7 KiB
YAML
53 lines
1.7 KiB
YAML
heat_template_version: 2016-04-08
|
|
|
|
description: >
|
|
Keepalived service configured with Puppet
|
|
|
|
parameters:
|
|
ServiceNetMap:
|
|
default: {}
|
|
description: Mapping of service_name -> network name. Typically set
|
|
via parameter_defaults in the resource registry. This
|
|
mapping overrides those in ServiceNetMapDefaults.
|
|
type: json
|
|
DefaultPasswords:
|
|
default: {}
|
|
type: json
|
|
EndpointMap:
|
|
default: {}
|
|
description: Mapping of service endpoint -> protocol. Typically set
|
|
via parameter_defaults in the resource registry.
|
|
type: json
|
|
ControlVirtualInterface:
|
|
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: ''
|
|
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
|
|
MonitoringSubscriptionKeepalived:
|
|
default: 'overcloud-keepalived'
|
|
type: string
|
|
|
|
outputs:
|
|
role_data:
|
|
description: Role data for the Keepalived role.
|
|
value:
|
|
service_name: keepalived
|
|
monitoring_subscription: {get_param: MonitoringSubscriptionKeepalived}
|
|
config_settings:
|
|
tripleo::keepalived::control_virtual_interface: {get_param: ControlVirtualInterface}
|
|
tripleo::keepalived::public_virtual_interface: {get_param: PublicVirtualInterface}
|
|
tripleo.keepalived.firewall_rules:
|
|
'106 keepalived vrrp':
|
|
proto: vrrp
|
|
step_config: |
|
|
include ::tripleo::profile::base::keepalived
|