openstack/tripleo-common
Code Issues Proposed changes

Add healthcheck script for Nova metadata

Browse Source 
This patch adds script for docker health check of Nova metadata API
service. The script checks API service using curl.

Existing script healthcheck/nova-metadata is also removed as this
script is linked in nova_metadata_footer template block. This block
does not exist (anymore?) and we have to have metadata check as part
of nova-api check, because those two services share container image.

Change-Id: I597efc57f9c564409b566c598d9d2467bb31d8cd
This commit is contained in:
Martin Mágr 2018-03-07 12:27:30 +01:00
parent da0b138ba4
commit 1760afaacc
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
container-images/tripleo_kolla_template_overrides.j2
View File

@ -399,12 +399,6 @@ RUN mkdir -p /openstack && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block nova_metadata_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/nova-metadata /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block nova_novncproxy_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/nova-vnc-proxy /openstack/healthcheck && \

10
healthcheck/nova-api
View File

@ -2,5 +2,13 @@
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
check_url=$(get_url_from_vhost /etc/httpd/conf.d/10-nova_api_wsgi.conf)
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}/"
else
check_url=$(get_url_from_vhost /etc/httpd/conf.d/10-nova_api_wsgi.conf)
fi
healthcheck_curl ${check_url}

6
healthcheck/nova-metadata
View File

@ -1,6 +0,0 @@
#!/bin/sh
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
check_url=$(get_url_from_vhost /etc/httpd/conf.d/10-metadata_wsgi.conf)
healthcheck_curl ${check_url}