From fb9f918f540329acec7c5fc78a1e516eadfdf75c Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Wed, 4 Apr 2018 12:00:15 +0200 Subject: [PATCH] Fix healthcheck script for neutron-api service Current script expects neutron-api to run with mod_wsgi Update to point to bind_host:bind_port and proper defaults Change-Id: I8b79bbb3d9831e58e5bcbb9144d2073c6ec0391c Closes-Bug: #1761122 (cherry picked from commit 1621bdbe4b13c0a80137cb6b39cfdd540caf673e) --- healthcheck/neutron-api | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/healthcheck/neutron-api b/healthcheck/neutron-api index 726f6ccfb..e626a6726 100755 --- a/healthcheck/neutron-api +++ b/healthcheck/neutron-api @@ -2,5 +2,12 @@ . ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh -check_url=$(get_url_from_vhost /etc/httpd/conf.d/10-neutron_wsgi.conf) -healthcheck_curl ${check_url} +bind_host=$(get_config_val /etc/neutron/neutron.conf DEFAULT bind_host 127.0.0.1) +bind_port=$(get_config_val /etc/neutron/neutron.conf DEFAULT bind_port 9696) + +# Add brackets if IPv6 +if [[ $bind_host =~ ":" ]]; then + bind_host="[${bind_host}]" +fi + +healthcheck_curl http://${bind_host}:${bind_port}/