From b2a04b986f6cca1136c5ea5b25f6ea53af944c7e Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Wed, 14 Feb 2018 20:01:34 +0000
Subject: [PATCH] Revert "Add healthchecks for barbican containers"

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 7076e569428f683a5457a6d937ead88b0d432d92.

Change-Id: I5cf5c9d70f66810db27880ca4116e7c005e66384
---
 .../tripleo_kolla_template_overrides.j2        | 18 ------------------
 healthcheck/barbican-api                       |  6 ------
 healthcheck/barbican-keystone-listener         | 14 --------------
 healthcheck/barbican-worker                    | 14 --------------
 4 files changed, 52 deletions(-)
 delete mode 100755 healthcheck/barbican-api
 delete mode 100755 healthcheck/barbican-keystone-listener
 delete mode 100755 healthcheck/barbican-worker

diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2
index 55c72e9c1..dee6137f4 100644
--- a/container-images/tripleo_kolla_template_overrides.j2
+++ b/container-images/tripleo_kolla_template_overrides.j2
@@ -134,24 +134,6 @@ RUN mkdir -p /openstack && \
     chmod a+rx /openstack/healthcheck
 {% 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 %}
 RUN mkdir -p /openstack && \
     ln -s /usr/share/openstack-tripleo-common/healthcheck/ceilometer-agent-central /openstack/healthcheck && \
diff --git a/healthcheck/barbican-api b/healthcheck/barbican-api
deleted file mode 100755
index d89d2069b..000000000
--- a/healthcheck/barbican-api
+++ /dev/null
@@ -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}
diff --git a/healthcheck/barbican-keystone-listener b/healthcheck/barbican-keystone-listener
deleted file mode 100755
index bbb6553a7..000000000
--- a/healthcheck/barbican-keystone-listener
+++ /dev/null
@@ -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
diff --git a/healthcheck/barbican-worker b/healthcheck/barbican-worker
deleted file mode 100755
index 62e9e4dee..000000000
--- a/healthcheck/barbican-worker
+++ /dev/null
@@ -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