openstack/tripleo-common
Code Issues Proposed changes

[Sensu] Don't use gem based plugins

Browse Source 
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
This commit is contained in:
Martin Mágr 2018-01-11 17:01:43 +01:00
parent 833a0187f8
commit dd24163e0b
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
container-images/tripleo_kolla_template_overrides.j2
View File

@ -107,6 +107,13 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
] %} ] %}
{% set sensu_client_packages_remove = [ {% set sensu_client_packages_remove = [
'MariaDB-client', '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 mariadb_packages_append = ['mariadb-server', 'mariadb-server-galera', 'xinetd'] %}
{% set sensu_client_packages_append = ['mariadb-server', 'mariadb-server-galera'] %} {% set sensu_client_packages_append = ['mariadb-server', 'mariadb-server-galera'] %}
@ -371,6 +378,9 @@ RUN mkdir -p /openstack && \
chmod a+rx /openstack/healthcheck chmod a+rx /openstack/healthcheck
{% endblock %} {% endblock %}
{% block sensu_clients_install %}
{% endblock %}
{% block sensu_client_footer %} {% block sensu_client_footer %}
RUN mkdir -p /openstack && \ RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/sensu-client /openstack/healthcheck && \ ln -s /usr/share/openstack-tripleo-common/healthcheck/sensu-client /openstack/healthcheck && \