openstack/tripleo-common
Code Issues Proposed changes

Revert "Add healthchecks for barbican containers"

Browse Source 
The rdo-kolla-build-integration is still failing now,
let's revert it until we find out what was wrong.

Related-Bug: #1749335

This reverts commit 7076e56942.

Change-Id: I5cf5c9d70f66810db27880ca4116e7c005e66384
This commit is contained in:
Emilien Macchi 2018-02-14 20:01:34 +00:00
parent 0eb3341486
commit b2a04b986f
4 changed files with 0 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
container-images/tripleo_kolla_template_overrides.j2
View File

@ -134,24 +134,6 @@ RUN mkdir -p /openstack && \
chmod a+rx /openstack/healthcheck chmod a+rx /openstack/healthcheck
{% endblock %} {% endblock %}
{% block barbican_api_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/barbican-api /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block barbican_keystone_listener_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/barbican-keystone-listener /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block barbican_worker_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/barbican-worker /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block ceilometer_central_footer %} {% block ceilometer_central_footer %}
RUN mkdir -p /openstack && \ RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/ceilometer-agent-central /openstack/healthcheck && \ ln -s /usr/share/openstack-tripleo-common/healthcheck/ceilometer-agent-central /openstack/healthcheck && \

6
healthcheck/barbican-api
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-barbican_wsgi_main.conf)
healthcheck_curl ${check_url}

14
healthcheck/barbican-keystone-listener
View File

@ -1,14 +0,0 @@
#!/bin/bash
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
process='barbican-keystone-listener'
args="${@:-5671 5672}"
if healthcheck_port $process $args; then
exit 0
else
ports=${args// /,}
echo "There is no $process process with opened RabbitMQ ports ($ports) running in the container"
exit 1
fi

14
healthcheck/barbican-worker
View File

@ -1,14 +0,0 @@
#!/bin/bash
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
process='barbican-worker'
args="${@:-5671 5672}"
if healthcheck_port $process $args; then
exit 0
else
ports=${args// /,}
echo "There is no $process process with opened RabbitMQ ports ($ports) running in the container"
exit 1
fi