openstack/tripleo-common
Code Issues Proposed changes

Merge "Fix gnocchi_statsd and ceilometer_agent_ipmi healthcheck"

Browse Source
This commit is contained in:
Zuul 2018-07-18 19:01:34 +00:00 committed by Gerrit Code Review
commit e8d2fcd0da
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
healthcheck/ceilometer-agent-ipmi
View File

@ -3,12 +3,12 @@
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
process='ceilometer-polling'
args="${@:-5671 5672}"
args="${@:-6379}"
if healthcheck_port $process $args; then
exit 0
else
ports=${args// /,}
echo "There is no $process process with opened RabbitMQ ports ($ports) running in the container"
echo "There is no $process process with opened Redis ports ($ports) running in the container"
exit 1
fi

9
healthcheck/gnocchi-statsd
View File

@ -3,12 +3,9 @@
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
process='gnocchi-statsd'
args="${@:-6379}"
bind_port=$(get_config_val /etc/gnocchi/gnocchi.conf statsd port 8125)
if healthcheck_port $process $args; then
exit 0
else
ports=${args// /,}
echo "There is no $process process with opened Redis ports ($ports) running in the container"
if ! healthcheck_listen $process $bind_port; then
echo "There is no $process process listening on ports $bind_port in the container."
exit 1
fi