openstack/tripleo-common
Code Issues Proposed changes

Fix keystone healthcheck

Browse Source 
puppet-keystone has been changed and health check needs to sync with the change.

Change-Id: If205c98fbb478e01e0cbac8179d028f1a0a3ef65
Closes-Bug: #1811961
This commit is contained in:
Martin Magr 2019-01-16 20:27:30 +01:00
parent f50b35e5f0
commit 4e34cb570d
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

@ -353,7 +353,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}