From dd24163e0b519b83122dbc7ee392391e66f96b35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr@redhat.com>
Date: Thu, 11 Jan 2018 17:01:43 +0100
Subject: [PATCH] [Sensu] Don't use gem based plugins

Kolla developers added gem based Sensu plugins installation for queens+.
This patch adds override as the above change is making sensu-client image
build fail in TripleO environment.

Closes-Bug: #1742731
Change-Id: I5d1f0992cc3f16fb156ae2324559a529c0ef3a44
---
 container-images/tripleo_kolla_template_overrides.j2 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2
index a41db135d..dd113f993 100644
--- a/container-images/tripleo_kolla_template_overrides.j2
+++ b/container-images/tripleo_kolla_template_overrides.j2
@@ -107,6 +107,13 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
 ] %}
 {% set sensu_client_packages_remove = [
     'MariaDB-client',
+    'ceph-common',
+    'cyrus-sasl-devel',
+    'gcc-c++',
+    'make',
+    'ntp',
+    'python-pymongo',
+    'ruby-devel'
 ] %}
 {% set mariadb_packages_append = ['mariadb-server', 'mariadb-server-galera', 'xinetd'] %}
 {% set sensu_client_packages_append = ['mariadb-server', 'mariadb-server-galera'] %}
@@ -371,6 +378,9 @@ RUN mkdir -p /openstack && \
     chmod a+rx /openstack/healthcheck
 {% endblock %}
 
+{% block sensu_clients_install %}
+{% endblock %}
+
 {% block sensu_client_footer %}
 RUN mkdir -p /openstack && \
     ln -s /usr/share/openstack-tripleo-common/healthcheck/sensu-client /openstack/healthcheck && \