From 55dbf6a48294a2dd924c1ca912bef1a34075b60a Mon Sep 17 00:00:00 2001 From: Zuul Date: Tue, 23 Apr 2019 23:02:09 +0000 Subject: [PATCH] Update git submodules * Update puppet-tripleo from branch 'master' - Merge "Fix keepalived VIP monitoring script" - Fix keepalived VIP monitoring script Currently keepalived monitors VIPs by running some shell commands that target HAProxy. The generated shell command is invalid, which makes keepalived log errors. Tue Apr 16 11:55:57 2019: Command = '/usr/bin/test' '-S' '/var/lib/haproxy/stats' '&&' 'echo' 'show' Tue Apr 16 11:55:57 2019: Script `haproxy` now returning 2 Tue Apr 16 11:55:57 2019: VRRP_Script(haproxy) failed (exited with status 2) Fix quoting and invoke /bin/sh explicitely to fix the error: Thu Apr 18 13:16:35 2019: Command = '/usr/bin/sh' '-c' 'test -S /var/lib/haproxy/stats && echo show info | socat /var/lib/haproxy/stats stdio' Thu Apr 18 13:16:35 2019: VRRP_Script(haproxy) succeeded Change-Id: I5a757f88963270e77c8ec411cd292a30f89c6bc0 Closes-Bug: #1825366 --- puppet-tripleo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/puppet-tripleo b/puppet-tripleo index 03b94bfb9d..1ad39b25f4 160000 --- a/puppet-tripleo +++ b/puppet-tripleo @@ -1 +1 @@ -Subproject commit 03b94bfb9df6e97e9e65d4a6ee61c89bb18c13b8 +Subproject commit 1ad39b25f4ae42a6bf79bf2f034ff97bbb585824