openstack/tripleo-common
Code Issues Proposed changes

Fix nova_vnc_proxy, ceilometer_agent_central and aodh_evaluator health check

Browse Source 
None of these services connects to RabbitMQ, so we need to verify functionality
of those services different way.

Change-Id: Ic6b51ad6be0d230375bdfb13e04f82629336d070
Closes-Bug: #1724922
This commit is contained in:
Martin Mágr 2017-10-19 20:34:33 +02:00
parent 0d8def224d
commit 91167665f5
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
healthcheck/aodh-evaluator
View File

@ -3,12 +3,12 @@
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
process='aodh-evaluator'
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

4
healthcheck/ceilometer-agent-central
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

12
healthcheck/nova-vnc-proxy
View File

@ -2,13 +2,7 @@
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
process='nova-novncproxy'
args="${@:-5671 5672}"
bind_host=$(get_config_val /etc/nova/nova.conf vnc novncproxy_host 127.0.0.1)
bind_port=$(get_config_val /etc/nova/nova.conf vnc novncproxy_port 6080)
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"
exit 1
fi
healthcheck_curl http://${bind_host}:${bind_port}/