aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-07 18:38:43 +0000
committerGerrit Code Review <review@openstack.org>2015-08-07 18:38:43 +0000
commit4811fd72510b23bbda9976918b01370495bcc87b (patch)
tree2714bbb231fed5a1b736e32ee96f972afcb66800 /docker
parenta5e907a8e91bc4e1d8f563dc79db0ee96c15d380 (diff)
parent8ede380f1d4d702bf29ea31e6f66dafd8518c759 (diff)
downloadkolla-4811fd72510b23bbda9976918b01370495bcc87b.tar.gz
kolla-4811fd72510b23bbda9976918b01370495bcc87b.zip
Merge "Add check_script for haproxy in keepalived"
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/common/keepalived/check_alive.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/docker/common/keepalived/check_alive.sh b/docker/common/keepalived/check_alive.sh
index ee0c5a85b..8c2684f10 100755
--- a/docker/common/keepalived/check_alive.sh
+++ b/docker/common/keepalived/check_alive.sh
@@ -1,7 +1,6 @@
#!/bin/bash
-# This is noop check script. Change it to something meaningful.
-# TODO (inc0): When HAProxy is implemented, this should be changed to HAProxy check
-# https://github.com/stackforge/kolla/blob/master/specs/high-availability.rst
+# This will return 0 when it successfully talks to the haproxy daemon via the socket
+# Failures return 1
-exit 0
+echo "show info" | socat unix-connect:/run/haproxy.sock stdio