openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Fix keystone healthcheck"

This commit is contained in:
Zuul 2019-01-22 22:04:03 +00:00 committed by Gerrit Code Review
parent fc673e2ca5 4e34cb570d
commit 2ac2962f35
3 changed files with 2 additions and 8 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

@ -354,7 +354,7 @@ RUN mkdir -p /openstack && \
{% block keystone_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/keystone-public /openstack/healthcheck && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/keystone /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}

2
healthcheck/keystone-public → healthcheck/keystone
View File

@ -2,5 +2,5 @@
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
check_url=$(get_url_from_vhost /etc/httpd/conf.d/10-keystone_wsgi_main.conf)
check_url=$(get_url_from_vhost /etc/httpd/conf.d/10-keystone_wsgi.conf)
healthcheck_curl ${check_url}

6
healthcheck/keystone-admin
View File

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