Merge "Correct vrrp script for haproxy status"

This commit is contained in:
Zuul
2018-07-24 20:12:48 +00:00
committed by Gerrit Code Review
2 changed files with 2 additions and 2 deletions

View File

@@ -99,7 +99,7 @@ class tripleo::keepalived (
case $::osfamily {
'RedHat': {
$keepalived_name_is_process = false
$keepalived_vrrp_script = 'systemctl status haproxy.service'
$keepalived_vrrp_script = 'test -S /var/lib/haproxy/stats && echo "show info" | socat /var/lib/haproxy/stats stdio'
} # RedHat
'Debian': {
$keepalived_name_is_process = true

View File

@@ -196,7 +196,7 @@ describe 'tripleo::keepalived' do
case facts[:osfamily]
when 'RedHat'
{ :name_is_process => 'false',
:vrrp_script => 'systemctl status haproxy.service' }
:vrrp_script => 'test -S /var/lib/haproxy/stats && echo "show info" | socat /var/lib/haproxy/stats stdio' }
when 'Debian'
{ :name_is_process => 'true',
:vrrp_script => nil }