openstack/openstack-helm
Code Issues Proposed changes

Fix rabbitmq readiness script error in k8s v1.7

Browse Source 
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
This commit is contained in:
Seungkyu Ahn 2017-09-27 11:47:52 +09:00
parent c31016b724
commit d2190de96e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rabbitmq/templates/bin/_rabbitmq-liveness.sh.tpl
View File

@ -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 # This is taken from https://github.com/openstack/fuel-ccp-rabbitmq/blob/master/service/files/rabbitmq-liveness.sh.j2
set -eu set -eu
set -o pipefail 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 source $(readlink -f $(dirname $0))/rabbitmq-check-helpers.sh
set-log-prefix "liveness:$$" set-log-prefix "liveness:$$"

2
rabbitmq/templates/bin/_rabbitmq-readiness.sh.tpl
View File

@ -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 # This is taken from https://github.com/openstack/fuel-ccp-rabbitmq/blob/master/service/files/rabbitmq-readiness.sh.j2
set -eu set -eu
set -o pipefail 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 source $(readlink -f $(dirname $0))/rabbitmq-check-helpers.sh
set-log-prefix "readiness:$$" set-log-prefix "readiness:$$"