diff --git a/healthcheck/nova-api b/healthcheck/nova-api index 3413bf21c..ef82ea7e7 100755 --- a/healthcheck/nova-api +++ b/healthcheck/nova-api @@ -3,10 +3,8 @@ . ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh -if ps -e | grep --quiet nova-api-metada; then - bind_host=$(get_config_val /etc/nova/nova.conf DEFAULT metadata_listen 127.0.0.1) - bind_port=$(get_config_val /etc/nova/nova.conf DEFAULT metadata_listen_port 8775) - check_url="http://${bind_host}:${bind_port}/" +if ps -ef | grep --quiet nova-metadata; then + check_url=$(get_url_from_vhost /etc/httpd/conf.d/10-nova_metadata_wsgi.conf) else check_url=$(get_url_from_vhost /etc/httpd/conf.d/10-nova_api_wsgi.conf) fi diff --git a/releasenotes/notes/nova_api_healthcheck_metadata_wsgi_change-4a191009d7ef9963.yaml b/releasenotes/notes/nova_api_healthcheck_metadata_wsgi_change-4a191009d7ef9963.yaml new file mode 100644 index 000000000..7e8ca8a4c --- /dev/null +++ b/releasenotes/notes/nova_api_healthcheck_metadata_wsgi_change-4a191009d7ef9963.yaml @@ -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.