openstack
/
puppet-tripleo
Code Issues Proposed changes

Add custom_vrrp_script param to keepalived 

This is needed when running keepalived in a container in
order provide a containerish version of the command to check
if haproxy is running.

Change-Id: I800d5c067a57b0ed7f15397a1f655fbd88a4633e
This commit is contained in:
Dan Prince 2018-01-20 20:36:52 -05:00
parent bf906de5b1
commit 2fca306c13
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/keepalived.pp
View File

@ -69,6 +69,12 @@
# An integer. # An integer.
# Defaults to 50 # Defaults to 50
# #
# [*custom_vrrp_script*]
# A custom vrrp script used to check if haproxy is running. Can
# be used to override the distro defaults in this module.
# Defaults to false.
#
class tripleo::keepalived ( class tripleo::keepalived (
$controller_virtual_ip, $controller_virtual_ip,
@ -82,6 +88,7 @@ class tripleo::keepalived (
$internal_api_virtual_ip = false, $internal_api_virtual_ip = false,
$storage_virtual_ip = false, $storage_virtual_ip = false,
$storage_mgmt_virtual_ip = false, $storage_mgmt_virtual_ip = false,
$custom_vrrp_script = false,
) { ) {
case $::osfamily { case $::osfamily {
@ -100,10 +107,16 @@ class tripleo::keepalived (
} }
} }
if $custom_vrrp_script {
$keepalived_vrrp_script_real = $custom_vrrp_script
} else {
$keepalived_vrrp_script_real = $keepalived_vrrp_script
}
class { '::keepalived': } class { '::keepalived': }
keepalived::vrrp_script { 'haproxy': keepalived::vrrp_script { 'haproxy':
name_is_process => $keepalived_name_is_process, name_is_process => $keepalived_name_is_process,
script => $keepalived_vrrp_script, script => $keepalived_vrrp_script_real,
} }
# KEEPALIVE INSTANCE CONTROL # KEEPALIVE INSTANCE CONTROL