From 64cd0faf6ac8eb54b70ced3de570b2932435a8d3 Mon Sep 17 00:00:00 2001
From: "DeJaeger, Darren (dd118r)" <dd118r@att.com>
Date: Thu, 18 Jun 2020 11:32:35 -0400
Subject: [PATCH] Adjust rabbitmq probes to better reflect its actual state

This PS looks to make a few small tweaks to the rabbitmq probes so
that its health and readiness is more reflective of what is actually
happening inside the container. We were previously seeing instances
of the pod marked as ready before it actually was.

Change-Id: If48ec02d4050f7385e71c2e6fe0fff8f59667af4
---
 rabbitmq/templates/bin/_rabbitmq-liveness.sh.tpl  | 2 +-
 rabbitmq/templates/bin/_rabbitmq-readiness.sh.tpl | 2 +-
 rabbitmq/templates/statefulset.yaml               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rabbitmq/templates/bin/_rabbitmq-liveness.sh.tpl b/rabbitmq/templates/bin/_rabbitmq-liveness.sh.tpl
index 8088a0af6..943209aad 100644
--- a/rabbitmq/templates/bin/_rabbitmq-liveness.sh.tpl
+++ b/rabbitmq/templates/bin/_rabbitmq-liveness.sh.tpl
@@ -20,5 +20,5 @@ if [ -f /tmp/rabbit-disable-liveness-probe ]; then
    exit 0
 else
    timeout 5 bash -c "true &>/dev/null </dev/tcp/${MY_POD_IP}/${PORT_AMPQ}"
-   exec rabbitmqctl status
+   exec rabbitmqctl node_health_check
 fi
diff --git a/rabbitmq/templates/bin/_rabbitmq-readiness.sh.tpl b/rabbitmq/templates/bin/_rabbitmq-readiness.sh.tpl
index b28be5dad..6184b35c0 100644
--- a/rabbitmq/templates/bin/_rabbitmq-readiness.sh.tpl
+++ b/rabbitmq/templates/bin/_rabbitmq-readiness.sh.tpl
@@ -19,5 +19,5 @@ set -e
 if [ -f /tmp/rabbit-disable-readiness ]; then
    exit 1
 else
-   exec rabbitmqctl status
+   exec rabbitmqctl node_health_check
 fi
diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml
index 9c53c8015..87d598deb 100644
--- a/rabbitmq/templates/statefulset.yaml
+++ b/rabbitmq/templates/statefulset.yaml
@@ -217,7 +217,7 @@ spec:
               command:
               - /tmp/rabbitmq-readiness.sh
           livenessProbe:
-            initialDelaySeconds: 30
+            initialDelaySeconds: 60
             timeoutSeconds: 10
             exec:
               command: