openstack
/
tripleo-common
Code Issues Proposed changes

Make curl healthchecks work with internal TLS 

Implement a new get_url_from_vhost bash function that parses the given
vhost configuration file and returns the URL on which the service can
be checked.

Change-Id: I071ed26328703df9f272b689af854e3a6a1c9e97
Closes-Bug: #1713689
(cherry picked from commit 0389eece17)
This commit is contained in:
Martin André 2017-08-29 15:04:25 +02:00 committed by Emilien Macchi
parent 3d1ddce104
commit 23b5468b45
13 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
container-images/tripleo_kolla_template_overrides.j2
View File

@ -161,7 +161,7 @@ HEALTHCHECK CMD /openstack/healthcheck
{% block heat_api_cfn_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/heat-api-cnf /openstack/healthcheck && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/heat-api-cfn /openstack/healthcheck && \
chmod -R a+rx /openstack
HEALTHCHECK CMD /openstack/healthcheck
{% endblock %}

13
healthcheck/common.sh
View File

@ -28,3 +28,16 @@ healthcheck_port () {
get_config_val () {
crudini --get "$1" "$2" "$3" 2> /dev/null || echo "$4"
}
# apachectl -S is slightly harder to parse and doesn't say if the vhost is serving SSL
get_url_from_vhost () {
vhost_file=$1
server_name=$(awk '/ServerName/ {print $2}' $vhost_file)
ssl_enabled=$(awk '/SSLEngine/ {print $2}' $vhost_file)
bind_port=$(grep -h "<VirtualHost .*>" $vhost_file | sed 's/<VirtualHost .*:\(.*\)>/\1/')
proto=http
if [[ $ssl_enabled == "on" ]]; then
proto=https
fi
echo ${proto}://${server_name}:${bind_port}/
}

1
healthcheck/glance-api
View File

@ -5,4 +5,5 @@
bind_host=$(get_config_val /etc/glance/glance-api.conf DEFAULT bind_host 127.0.0.1)
bind_port=$(get_config_val /etc/glance/glance-api.conf DEFAULT bind_port 9292)
# glance-api is still eventlet
healthcheck_curl http://${bind_host}:${bind_port}/

5
healthcheck/heat-api
View File

@ -2,6 +2,5 @@
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
bind_host=$(get_config_val /etc/heat/heat.conf heat_api bind_host 127.0.0.1)
bind_port=$(get_config_val /etc/heat/heat.conf heat_api bind_port 8004)
healthcheck_curl http://${bind_host}:${bind_port}/
check_url=$(get_url_from_vhost /etc/httpd/conf.d/10-heat_api_wsgi.conf)
healthcheck_curl ${check_url}

5
healthcheck/heat-api-cfn
View File

@ -2,6 +2,5 @@
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
bind_host=$(get_config_val /etc/heat/heat.conf heat_api_cfn bind_host 127.0.0.1)
bind_port=$(get_config_val /etc/heat/heat.conf heat_api_cfn bind_port 8000)
healthcheck_curl http://${bind_host}:${bind_port}/
check_url=$(get_url_from_vhost /etc/httpd/conf.d/10-heat_api_cfn_wsgi.conf)
healthcheck_curl ${check_url}

5
healthcheck/ironic-api
View File

@ -2,6 +2,5 @@
. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh
bind_host=$(get_config_val /etc/ironic/ironic.conf api host_ip 127.0.0.1)
bind_port=$(get_config_val /etc/ironic/ironic.conf api port 6385)
healthcheck_curl http://${bind_host}:${bind_port}/
check_url=$(get_url_from_vhost /etc/httpd/conf.d/10-ironic_wsgi.conf)
healthcheck_curl ${check_url}

5
healthcheck/keystone-admin
View File

@ -2,6 +2,5 @@
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
bind_host=$(get_config_val /etc/keystone/keystone.conf DEFAULT admin_bind_host 127.0.0.1)
bind_port=$(get_config_val /etc/keystone/keystone.conf DEFAULT admin_port 5000)
healthcheck_curl http://${bind_host}:${bind_port}/
check_url=$(get_url_from_vhost /etc/httpd/conf.d/10-keystone_wsgi_admin.conf)
healthcheck_curl ${check_url}

5
healthcheck/keystone-public
View File

@ -2,6 +2,5 @@
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
bind_host=$(get_config_val /etc/keystone/keystone.conf DEFAULT public_bind_host 127.0.0.1)
bind_port=$(get_config_val /etc/keystone/keystone.conf DEFAULT public_port 5000)
healthcheck_curl http://${bind_host}:${bind_port}/
check_url=$(get_url_from_vhost /etc/httpd/conf.d/10-keystone_wsgi_main.conf)
healthcheck_curl ${check_url}

5
healthcheck/nova-api
View File

@ -2,6 +2,5 @@
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
bind_host=$(get_config_val /etc/nova/nova.conf DEFAULT osapi_compute_listen 127.0.0.1)
bind_port=$(get_config_val /etc/nova/nova.conf DEFAULT osapi_compute_listen_port 8774)
healthcheck_curl http://${bind_host}:${bind_port}/
check_url=$(get_url_from_vhost /etc/httpd/conf.d/10-nova_api_wsgi.conf)
healthcheck_curl ${check_url}

1
healthcheck/swift-account-server
View File

@ -9,6 +9,7 @@ if ! crudini --get $conf pipeline:main pipeline | grep -q healthcheck; then
exit 0
fi
# swift-account-server is still eventlet
bind_host=$(get_config_val $conf DEFAULT bind_ip 127.0.0.1)
bind_port=$(get_config_val $conf DEFAULT bind_port 6002)
healthcheck_curl http://${bind_host}:${bind_port}/healthcheck

1
healthcheck/swift-container-server
View File

@ -9,6 +9,7 @@ if ! crudini --get $conf pipeline:main pipeline | grep -q healthcheck; then
exit 0
fi
# swift-container-server is still eventlet
bind_host=$(get_config_val $conf DEFAULT bind_ip 127.0.0.1)
bind_port=$(get_config_val $conf DEFAULT bind_port 6001)
healthcheck_curl http://${bind_host}:${bind_port}/healthcheck

1
healthcheck/swift-object-server
View File

@ -9,6 +9,7 @@ if ! crudini --get $conf pipeline:main pipeline | grep -q healthcheck; then
exit 0
fi
# swift-object-server is still eventlet
bind_host=$(get_config_val $conf DEFAULT bind_ip 127.0.0.1)
bind_port=$(get_config_val $conf DEFAULT bind_port 6000)
healthcheck_curl http://${bind_host}:${bind_port}/healthcheck

1
healthcheck/swift-proxy
View File

@ -9,6 +9,7 @@ if ! crudini --get $conf pipeline:main pipeline | grep -q healthcheck; then
exit 0
fi
# swift-proxy is still eventlet
bind_host=$(get_config_val $conf DEFAULT bind_ip 127.0.0.1)
bind_port=$(get_config_val $conf DEFAULT bind_port 8080)
healthcheck_curl http://${bind_host}:${bind_port}/healthcheck