RabbitMQ: Improve robustness of readyness checks

This PS moves the readyness check to simply checking if the ampq
port is open, both simplifying it and also correctly indicating if
the process is ready to serve requests.

Change-Id: I38416c8bf3b242fa344875da13f81e5bbc1983c7
Signed-off-by: Pete Birley <pete@port.direct>

rabbitmq/templates/bin/_rabbitmq-readiness.sh.tpl

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-{{/*
-Copyright 2017 The Openstack-Helm Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/}}
-
-set -e
-
-exec rabbitmqctl status

rabbitmq/templates/configmap-bin.yaml

@@ -30,8 +30,6 @@ data:
 {{ tuple "bin/_rabbitmq-test.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
   rabbitmq-liveness.sh: |
 {{ tuple "bin/_rabbitmq-liveness.sh.tpl" . | include  "helm-toolkit.utils.template" | indent 4 }}
-  rabbitmq-readiness.sh: |
-{{ tuple "bin/_rabbitmq-readiness.sh.tpl" . | include  "helm-toolkit.utils.template" | indent 4 }}
   rabbitmq-start.sh: |
 {{ tuple "bin/_rabbitmq-start.sh.tpl" . | include  "helm-toolkit.utils.template" | indent 4 }}
 {{ end }}

rabbitmq/templates/statefulset.yaml

@@ -136,9 +136,8 @@ spec:
           readinessProbe:
             initialDelaySeconds: 10
             timeoutSeconds: 10
-            exec:
-              command:
-              - /tmp/rabbitmq-readiness.sh
+            tcpSocket:
+              port: {{ tuple "oslo_messaging" "internal" "amqp" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           livenessProbe:
             initialDelaySeconds: 30
             timeoutSeconds: 10

tools/deployment/openstack-support/030-rabbitmq.sh

@@ -23,7 +23,7 @@ make rabbitmq
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install rabbitmq ./rabbitmq \
     --namespace=openstack \
-    --set pod.replicas.server=1 \
+    --set pod.replicas.server=3 \
     ${OSH_EXTRA_HELM_ARGS} \
     ${OSH_EXTRA_HELM_ARGS_RABBITMQ}