From a1fc5268e673838db30bd4b7f2e4464efb27948c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr@redhat.com>
Date: Wed, 7 Mar 2018 16:35:38 +0100
Subject: [PATCH] Activate another set of healthchecks

In previous patches link to appropriate scripts were not added.
This patch adds links related to following already merged patches:
 - I757d53189f5819bb3a0e7bebe277353f3460738d
 - I4a193d7ce1c455da2865498470ed3b98160df112
 - Ie8eaab9919bde61793a3310328ee9f117c4e58da
 - Ief543580e6b717bb9dba62b19ffe12aff5395ff9

This patch also adds exec permission to some of the healthchecks
added in above patches.

Change-Id: Id5dc7d169301e45cb0abab7cecae67457db9fd96
(cherry picked from commit e85b982507ec203304b609a5b27434a0aef77919)
---
 .../tripleo_kolla_template_overrides.j2       | 24 +++++++++++++++++++
 healthcheck/ceilometer-agent-compute          |  0
 2 files changed, 24 insertions(+)
 mode change 100644 => 100755 healthcheck/ceilometer-agent-compute

diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2
index 5c93ab6d9..e96c8a17e 100644
--- a/container-images/tripleo_kolla_template_overrides.j2
+++ b/container-images/tripleo_kolla_template_overrides.j2
@@ -172,6 +172,12 @@ RUN mkdir -p /openstack && \
     chmod a+rx /openstack/healthcheck
 {% endblock %}
 
+{% block ceilometer_compute_footer %}
+RUN mkdir -p /openstack && \
+    ln -s /usr/share/openstack-tripleo-common/healthcheck/ceilometer-agent-compute /openstack/healthcheck && \
+    chmod a+rx /openstack/healthcheck
+{% endblock %}
+
 {% block ceilometer_ipmi_footer %}
 RUN mkdir -p /openstack && \
     ln -s /usr/share/openstack-tripleo-common/healthcheck/ceilometer-agent-ipmi /openstack/healthcheck && \
@@ -380,6 +386,12 @@ RUN mkdir -p /openstack && \
     chmod a+rx /openstack/healthcheck
 {% endblock %}
 
+{% block neutron_sriov_agent_footer %}
+RUN mkdir -p /openstack && \
+    ln -s /usr/share/openstack-tripleo-common/healthcheck/neutron-sriov-agent /openstack/healthcheck && \
+    chmod a+rx /openstack/healthcheck
+{% endblock %}
+
 {% block nova_api_footer %}
 RUN mkdir -p /openstack && \
     ln -s /usr/share/openstack-tripleo-common/healthcheck/nova-api /openstack/healthcheck && \
@@ -410,6 +422,12 @@ RUN mkdir -p /openstack && \
     chmod a+rx /openstack/healthcheck
 {% endblock %}
 
+{% block nova_libvirt_footer %}
+RUN mkdir -p /openstack && \
+    ln -s /usr/share/openstack-tripleo-common/healthcheck/nova-libvirt /openstack/healthcheck && \
+    chmod a+rx /openstack/healthcheck
+{% endblock %}
+
 {% block nova_novncproxy_footer %}
 RUN mkdir -p /openstack && \
     ln -s /usr/share/openstack-tripleo-common/healthcheck/nova-vnc-proxy /openstack/healthcheck && \
@@ -434,6 +452,12 @@ RUN mkdir -p /openstack && \
     chmod a+rx /openstack/healthcheck
 {% endblock %}
 
+{% block octavia_api_footer %}
+RUN mkdir -p /openstack && \
+    ln -s /usr/share/openstack-tripleo-common/healthcheck/octavia-api /openstack/healthcheck && \
+    chmod a+rx /openstack/healthcheck
+{% endblock %}
+
 {% block octavia_health_manager_footer %}
 RUN mkdir -p /openstack && \
     ln -s /usr/share/openstack-tripleo-common/healthcheck/octavia-health-manager /openstack/healthcheck && \
diff --git a/healthcheck/ceilometer-agent-compute b/healthcheck/ceilometer-agent-compute
old mode 100644
new mode 100755