openstack/tripleo-common
Code Issues Proposed changes

Fix redis healthcheck

Browse Source 
nc is not installed in the containers by default, but socat is available
so lets use that instead.

Change-Id: Ib98e06531d414f62498fd7c1130899f74a066957
Closes-Bug: #1771705
This commit is contained in:
Alex Schultz 2018-05-16 18:07:29 -06:00
parent 26ea79f0a3
commit c10d309678
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
healthcheck/redis
View File

@ -14,9 +14,9 @@ fi
if parse_out=$(cat "/etc/redis.conf" | egrep "^requirepass +.*$"); then
redis_pass=$(echo -n $parse_out | awk '{print $2}')
result=$(printf "*2\r\n\$4\r\nAUTH\r\n\$${#redis_pass}\r\n${redis_pass}\r\n*1\r\n\$4\r\nPING\r\n" | nc $redis_host $redis_port)
result=$(printf "*2\r\n\$4\r\nAUTH\r\n\$${#redis_pass}\r\n${redis_pass}\r\n*1\r\n\$4\r\nPING\r\n" | socat - TCP:$redis_host:$redis_port)
else
result=$(printf "*1\r\n\$4\r\nPING\r\n" | nc $redis_host $redis_port)
result=$(printf "*1\r\n\$4\r\nPING\r\n" | socat - TCP:$redis_host:$redis_port)
fi
if echo $result | grep -q '+PONG'; then