From 1b173fa8e8c08b302fde6b0a0d868b24a4c5e095 Mon Sep 17 00:00:00 2001
From: John Ward <john.ward@rackspace.com>
Date: Wed, 27 Feb 2019 20:47:38 -0600
Subject: [PATCH 1/2] RI-669: Update haproxycheck.yml to restart containers if
 they are failing check during thaw

---
 gating/thaw/haproxycheck.yml | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/gating/thaw/haproxycheck.yml b/gating/thaw/haproxycheck.yml
index 72b29dda5..396a30e89 100644
--- a/gating/thaw/haproxycheck.yml
+++ b/gating/thaw/haproxycheck.yml
@@ -3,14 +3,14 @@
   tasks:
   - name: Check state of haproxy backends
     shell: |
-      set -eu
+      set -u
 
       # There are two flavors of netcat on Ubuntu, but
       # only this one supports the -U parameter.
       if ! dpkg-query --status netcat-openbsd &>/dev/null; then
-        echo "netcat not installed - installing it now"
-        apt-get update
-        apt-get install netcat-openbsd
+      echo "netcat not installed - installing it now"
+      apt-get update
+      apt-get install netcat-openbsd
       fi
 
       # Check haproxy backends excluding elasticsearch
@@ -25,19 +25,26 @@
 
       for i in {1..30}
       do
-        echo "show servers state" |nc -U /var/run/haproxy.stat > haproxy.stat
-        awk '$2 !~ "elastic" && $0 != "1" && $1 != "#" && $6 != "2" {print $0}' \
+      echo "show servers state" |nc -U /var/run/haproxy.stat > haproxy.stat
+      awk '$2 !~ "elastic" && $0 != "1" && $1 != "#" && $6 != "2" {print $0}' \
           < haproxy.stat  \
           |tee haproxy.down
-        if [[ $(wc -l < haproxy.down) == 1 ]]
-        then
+      if [[ $(wc -l < haproxy.down) == 1 ]]
+      then
           echo "HAProxy healthchecks passing."
           exit 0
-        else
+      else
+          echo "Attempting to restart failing containers"
+          for container in $(cat haproxy.down | awk '$0 != "^$/" {print $4|"sort -u"}'); do
+              echo "Stopping container $container"
+              lxc-stop -n $container
+              echo "Starting container $container"
+              lxc-start -n $container
+          done
           echo "At least one HAProxy backend is down, sleeping for 60s before"
           echo "rechecking."
           sleep 60
-        fi
+      fi
       done
       print "HAProxy backends failed to come up in time"
       exit 1

From 5ed2098ae34160e59f9c3b83a4a745ab703a76f5 Mon Sep 17 00:00:00 2001
From: John Ward <john.ward@rackspace.com>
Date: Wed, 27 Feb 2019 20:54:35 -0600
Subject: [PATCH 2/2] RI-669: Update haproy install tag on thaw

---
 gating/thaw/run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gating/thaw/run b/gating/thaw/run
index 49b568466..6c209ecd2 100755
--- a/gating/thaw/run
+++ b/gating/thaw/run
@@ -34,7 +34,7 @@ export ANSIBLE_STDOUT_CALLBACK=debug
 # IP fact being up to date.
 export ANSIBLE_GATHERING=implicit
 openstack-ansible -v /opt/rpc-openstack/gating/thaw/thaw.yml
-openstack-ansible -t haproxy_server-config haproxy-install.yml
+openstack-ansible -t haproxy-server haproxy-install.yml
 
 lxc-autostart --all