Fix nova_vnc_proxy, ceilometer_agent_central and aodh_evaluator health check
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:
parent
0d8def224d
commit
91167665f5
|
@ -3,12 +3,12 @@
|
||||||
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
|
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
|
||||||
|
|
||||||
process='aodh-evaluator'
|
process='aodh-evaluator'
|
||||||
args="${@:-5671 5672}"
|
args="${@:-6379}"
|
||||||
|
|
||||||
if healthcheck_port $process $args; then
|
if healthcheck_port $process $args; then
|
||||||
exit 0
|
exit 0
|
||||||
else
|
else
|
||||||
ports=${args// /,}
|
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
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -3,12 +3,12 @@
|
||||||
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
|
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
|
||||||
|
|
||||||
process='ceilometer-polling'
|
process='ceilometer-polling'
|
||||||
args="${@:-5671 5672}"
|
args="${@:-6379}"
|
||||||
|
|
||||||
if healthcheck_port $process $args; then
|
if healthcheck_port $process $args; then
|
||||||
exit 0
|
exit 0
|
||||||
else
|
else
|
||||||
ports=${args// /,}
|
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
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -2,13 +2,7 @@
|
||||||
|
|
||||||
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
|
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
|
||||||
|
|
||||||
process='nova-novncproxy'
|
bind_host=$(get_config_val /etc/nova/nova.conf vnc novncproxy_host 127.0.0.1)
|
||||||
args="${@:-5671 5672}"
|
bind_port=$(get_config_val /etc/nova/nova.conf vnc novncproxy_port 6080)
|
||||||
|
|
||||||
if healthcheck_port $process $args; then
|
healthcheck_curl http://${bind_host}:${bind_port}/
|
||||||
exit 0
|
|
||||||
else
|
|
||||||
ports=${args// /,}
|
|
||||||
echo "There is no $process process with opened RabbitMQ ports ($ports) running in the container"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
Loading…
Reference in New Issue