openstack/tripleo-common
Code Issues Proposed changes

Merge "[Sensu] Don't use gem based plugins"

Browse Source
This commit is contained in:
Zuul 2018-01-13 10:47:17 +00:00 committed by Gerrit Code Review
commit e423c4a438
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

@ -108,6 +108,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',
'pacemaker', 'pacemaker-remote', 'pcs', 'libqb', 'resource-agents'] %} 'pacemaker', 'pacemaker-remote', 'pcs', 'libqb', 'resource-agents'] %}
@ -375,6 +382,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 && \