From d2190de96e69bee1b0bf6abc133ff5db139fb699 Mon Sep 17 00:00:00 2001 From: Seungkyu Ahn Date: Wed, 27 Sep 2017 11:47:52 +0900 Subject: [PATCH] Fix rabbitmq readiness script error in k8s v1.7 In Kubernetes version 1.7.x, /proc/1/fd/2 command in rabbitmq readiness shell script makes an error. Instead of using /proc/1/fd/2, use /dev/null. Change-Id: Ia4fb7f3130ec1a8fccc125bf11e997b77935e1ba Closes-bug: 1719763 --- rabbitmq/templates/bin/_rabbitmq-liveness.sh.tpl | 2 +- rabbitmq/templates/bin/_rabbitmq-readiness.sh.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rabbitmq/templates/bin/_rabbitmq-liveness.sh.tpl b/rabbitmq/templates/bin/_rabbitmq-liveness.sh.tpl index 23e012c382..780fd054b8 100644 --- a/rabbitmq/templates/bin/_rabbitmq-liveness.sh.tpl +++ b/rabbitmq/templates/bin/_rabbitmq-liveness.sh.tpl @@ -19,7 +19,7 @@ limitations under the License. # This is taken from https://github.com/openstack/fuel-ccp-rabbitmq/blob/master/service/files/rabbitmq-liveness.sh.j2 set -eu set -o pipefail -exec 1>/proc/1/fd/2 2>/proc/1/fd/2 +exec 1>/dev/null 2>&1 source $(readlink -f $(dirname $0))/rabbitmq-check-helpers.sh set-log-prefix "liveness:$$" diff --git a/rabbitmq/templates/bin/_rabbitmq-readiness.sh.tpl b/rabbitmq/templates/bin/_rabbitmq-readiness.sh.tpl index f5a5d4fedf..d78c957311 100644 --- a/rabbitmq/templates/bin/_rabbitmq-readiness.sh.tpl +++ b/rabbitmq/templates/bin/_rabbitmq-readiness.sh.tpl @@ -19,7 +19,7 @@ limitations under the License. # This is taken from https://github.com/openstack/fuel-ccp-rabbitmq/blob/master/service/files/rabbitmq-readiness.sh.j2 set -eu set -o pipefail -exec 1>/proc/1/fd/2 2>/proc/1/fd/2 +exec 1>/dev/null 2>&1 source $(readlink -f $(dirname $0))/rabbitmq-check-helpers.sh set-log-prefix "readiness:$$"