From 317c5a29e62789a2d16830e80a714a00a13b183b Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Mon, 12 Feb 2018 15:38:16 +0200 Subject: [PATCH] Add healthchecks for barbican containers The barbican-keystone-listener and worker only listen for the message queue, so the healthcheck reflects that. This patch only adds healthcheck scripts after the issue with rdo-kolla-build-integration CI job. For details see: https://review.openstack.org/#/c/544626 Co-Authored-By: Juan Antonio Osorio Robles Change-Id: Ic0573f6dfe550dd7f5d6bc579b3b06660d4bf1fc --- healthcheck/barbican-api | 6 ++++++ healthcheck/barbican-keystone-listener | 14 ++++++++++++++ healthcheck/barbican-worker | 14 ++++++++++++++ 3 files changed, 34 insertions(+) create mode 100755 healthcheck/barbican-api create mode 100755 healthcheck/barbican-keystone-listener create mode 100755 healthcheck/barbican-worker diff --git a/healthcheck/barbican-api b/healthcheck/barbican-api new file mode 100755 index 000000000..d89d2069b --- /dev/null +++ b/healthcheck/barbican-api @@ -0,0 +1,6 @@ +#!/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} diff --git a/healthcheck/barbican-keystone-listener b/healthcheck/barbican-keystone-listener new file mode 100755 index 000000000..bbb6553a7 --- /dev/null +++ b/healthcheck/barbican-keystone-listener @@ -0,0 +1,14 @@ +#!/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 diff --git a/healthcheck/barbican-worker b/healthcheck/barbican-worker new file mode 100755 index 000000000..62e9e4dee --- /dev/null +++ b/healthcheck/barbican-worker @@ -0,0 +1,14 @@ +#!/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