From 3ddb77e34096a095909ea4dc5a18d478eeb93cab Mon Sep 17 00:00:00 2001
From: Martin Schuppert <mschuppert@redhat.com>
Date: Thu, 1 Aug 2019 16:41:40 +0200
Subject: [PATCH] Fix swift-proxy healthcheck

With the current swift-proxy healthcheck the container status is
unhealty even the service is up.

The used ps/grep won't return the swift proxy processes as the
output gets truncated:

()[root@overcloud-controller-0 /]$ ps -e
    PID TTY          TIME CMD
      1 ?        00:00:00 dumb-init
      6 ?        00:02:52 swift-proxy-ser
     28 ?        00:00:25 swift-proxy-ser
   4753 pts/1    00:00:00 sh
   4797 pts/1    00:00:00 ps

As a result we end up in the else, checking the cache.

This moves the if to use pgrep instead.

Change-Id: I169b07553b171fcacb532bf58acc4200e270bfbb
---
 healthcheck/swift-proxy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/healthcheck/swift-proxy b/healthcheck/swift-proxy
index 19ca60219..00528ebae 100755
--- a/healthcheck/swift-proxy
+++ b/healthcheck/swift-proxy
@@ -2,7 +2,7 @@
 
 . ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
 
-if ps -e | grep --quiet swift-proxy-server; then
+if pgrep -f swift-proxy-server; then
     conf=/etc/swift/proxy-server.conf
 
     if ! crudini --get $conf pipeline:main pipeline | grep -q healthcheck; then