Fix nova-api healthcheck in case of nova metadata wsgi
While we have a dedicated nova_metadata healthcheck script, the nova_metadata and nova_api use the same container image and the current nova api healtcheck script still checks the non wsgi implementation. This changes the nova_api healthcheck script to check the metadata wsgi vhost config for details instead of the details in nova.conf. Change-Id: I028caee75e47618d5d0c55054ef33216d05d41b6 Closes-Bug: #1797514
This commit is contained in:
parent
024a359e12
commit
a77d5c86e2
|
@ -3,10 +3,8 @@
|
||||||
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
|
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
|
||||||
|
|
||||||
|
|
||||||
if ps -e | grep --quiet nova-api-metada; then
|
if ps -ef | grep --quiet nova-metadata; then
|
||||||
bind_host=$(get_config_val /etc/nova/nova.conf DEFAULT metadata_listen 127.0.0.1)
|
check_url=$(get_url_from_vhost /etc/httpd/conf.d/10-nova_metadata_wsgi.conf)
|
||||||
bind_port=$(get_config_val /etc/nova/nova.conf DEFAULT metadata_listen_port 8775)
|
|
||||||
check_url="http://${bind_host}:${bind_port}/"
|
|
||||||
else
|
else
|
||||||
check_url=$(get_url_from_vhost /etc/httpd/conf.d/10-nova_api_wsgi.conf)
|
check_url=$(get_url_from_vhost /etc/httpd/conf.d/10-nova_api_wsgi.conf)
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
While we have a dedicated nova_metadata healthcheck script, the
|
||||||
|
nova_metadata and nova_api container the same image and the current nova
|
||||||
|
api healtcheck script still checks the non wsgi implementation. This
|
||||||
|
changes the nova_api healthcheck script to check the metadata wsgi vhost
|
||||||
|
config for details instead of the details in nova.conf.
|
Loading…
Reference in New Issue