Fix monasca-grafana, fluentd and sensu images
1. monasca-grafana - pin rake to <13 Rake 13.0.0 (released today) depends on Ruby 2.2, but CentOS 7 only provides Ruby 2.0. This change pins rake in the monasca-grafana image to versions earlier than 13.0.0. 2. fluentd on Ubuntu - pin faraday to <0.16 Rocky and earlier only. Faraday 0.16.x depends on Ruby 2.3+, but td-agent on Ubuntu uses its own old version of Ruby. This change pins faraday in the Ubuntu and Debian fluentd images to versions earlier than 0.16. 3. sensu-client: Pin minitest Ruby gem on CentOS This was originally in change I1afd2d50c0dc2de6d305b56bd5f9182745fee843 on master and stable/stein. (cherry picked from commit305312f107
) Change-Id: Id9a76f459aff016fbc920370c0a3ec58e0397fcb Closes-Bug: #1845647 Closes-Bug: #1845705 Closes-bug: #1845843 (cherry picked from commita0712ceef3
)
This commit is contained in:
parent
e1feb998ee
commit
74fc8ba940
|
@ -60,7 +60,11 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
|
|||
{% block fluentd_plugins_install %}
|
||||
|
||||
{% if base_distro in ['debian', 'ubuntu'] %}
|
||||
# NOTE(mgoddard): fluent-plugin-elasticsearch requires faraday, which from
|
||||
# 0.16.0 depends on Ruby 2.3, but td-agent provides its own older version of
|
||||
# Ruby.
|
||||
{% set fluentd_plugins = [
|
||||
'faraday:"~>0.15.4"',
|
||||
'fluent-plugin-elasticsearch',
|
||||
'fluent-plugin-grep',
|
||||
'fluent-plugin-grok-parser:2.1.4',
|
||||
|
|
|
@ -48,7 +48,9 @@ ARG monasca_grafana_version=grafana4
|
|||
ARG monasca_grafana_url=https://github.com/monasca/grafana/archive/$monasca_grafana_version.tar.gz
|
||||
|
||||
{% block monasca_grafana_install %}
|
||||
RUN gem install rake fpm \
|
||||
# NOTE(mgoddard): Pinning rake because rake 13.0.0 depends on Ruby 2.2, and CentOS 7 only provides
|
||||
# Ruby 2.0.
|
||||
RUN gem install rake:"~>12" fpm \
|
||||
&& curl -sSL -o /tmp/monasca-grafana.tgz ${monasca_grafana_url} \
|
||||
&& mkdir -p ${monasca_grafana_build_path} \
|
||||
&& tar --strip 1 -xvf /tmp/monasca-grafana.tgz -C ${monasca_grafana_build_path} \
|
||||
|
|
|
@ -78,7 +78,8 @@ RUN echo '{{ image_name }} not yet available for {{ base_distro }}' \
|
|||
# TODO(mandre) Use packaged sensu plugins from centos-opstools for binary distro
|
||||
# http://cbs.centos.org/koji/search?match=glob&type=package&terms=*sensu*
|
||||
# NOTE(hrw): whois 5.0.0 requires Ruby 2.4+ while CentOS has 2.0
|
||||
RUN {%if base_distro in ['centos', 'rhel', 'oraclelinux'] %} gem install whois:"<5" && {% endif %} sensu-install --plugins {{ sensu_plugins | customizable('plugins') | join (',') }}
|
||||
# NOTE(yoctozepto): pinning minitest for the same reason
|
||||
RUN {%if base_distro in ['centos', 'rhel', 'oraclelinux'] %} gem install whois:"<5" minitest:"~>5.11.3" && {% endif %} sensu-install --plugins {{ sensu_plugins | customizable('plugins') | join (',') }}
|
||||
{% endblock %}
|
||||
|
||||
{% block sensu_client_footer %}{% endblock %}
|
||||
|
|
Loading…
Reference in New Issue