openstack
/
puppet-tripleo
Code Issues Proposed changes

Correct vrrp script for haproxy status 

Currently, on a containerized undercloud, we get error messages from
keepalived container:
/usr/bin/systemctl status haproxy.service exited with status 1

Even if the undercloud is currently not in HA, it's still a good thing
to get clean logs.

Note: the command is launched by the keepalived container, hence we
cannot use pgrep nor anything else. We also need the /var/lib/haproxy
mount in the keepalived container, shared from the haproxy container on
the host.

Change-Id: Ib5050a3a6af262e26b5523974d1d4a80c4e92834
This commit is contained in:
Cédric Jeanneret 2018-07-19 10:28:27 +02:00
parent a2666261b5
commit 50ce48cd28
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/keepalived.pp
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

2
spec/classes/tripleo_keepalive_spec.rb
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 }