openstack
/
kolla
Code Issues Proposed changes

Pin sensu mailer and slack plugins, fix rabbitmq 

Multiple issues being fixed here.

1. The 4.0.0 release of the mailer plugin requires Ruby 2.3+, which is
   not avaiable in CentOS/RHEL7. Pin it to the 3.0.0 release, which is
   supported. While we're here, also pin the slack plugin.

   Both use the pessimistic version operator, as used in the sensu-client
   image.

2. The response code is 301 when get the
   rabbitmq_clusterer-3.6.x-667f92b0.ez with curl.  The rabbitmq source
   has changed http to https.

3. OracleLinux repos definition was changed in official image.

Co-Authored-By: chenyaguang <chenyaguang@szzt.com.cn>
Change-Id: Idac8cb696c81c7413a3da79b4868f556ef36fc8d
Closes-Bug: #1820594
(cherry picked from commit 4058c8e298)
This commit is contained in:
Mark Goddard 2019-03-18 11:49:23 +00:00
parent 9c845e6baa
commit 425f45ce50
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/rabbitmq/Dockerfile.j2
View File

@ -27,7 +27,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %}
{% else %}
{% set rabbitmq_packages = rabbitmq_packages + [
'http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.5/rabbitmq-server_3.6.5-1_all.deb',
'https://www.rabbitmq.com/releases/rabbitmq-server/v3.6.5/rabbitmq-server_3.6.5-1_all.deb',
] %}
{% endif %}
@ -52,7 +52,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
RUN rm -rf /var/lib/rabbitmq/* \
&& ln -s /usr/lib/rabbitmq/lib/rabbitmq_server-3.6.* /usr/lib/rabbitmq/lib/rabbitmq_server-3.6 \
&& curl -o /usr/lib/rabbitmq/lib/rabbitmq_server-3.6/plugins/rabbitmq_clusterer-3.6.x-667f92b0.ez http://www.rabbitmq.com/community-plugins/v3.6.x/rabbitmq_clusterer-3.6.x-667f92b0.ez \
&& curl -o /usr/lib/rabbitmq/lib/rabbitmq_server-3.6/plugins/rabbitmq_clusterer-3.6.x-667f92b0.ez https://www.rabbitmq.com/community-plugins/v3.6.x/rabbitmq_clusterer-3.6.x-667f92b0.ez \
&& /usr/lib/rabbitmq/bin/rabbitmq-plugins enable --offline \
rabbitmq_management \
rabbitmq_clusterer

7
docker/sensu/sensu-server/Dockerfile.j2
View File

@ -23,9 +23,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block sensu_server_plugins_install %}
# Sensu plugins are all using semantic versioning.
# Let's cap them to the known major version that works with the ruby shipped on
# rhel/centos/oraclelinux (currently 2.0)
{% set sensu_plugins = [
'mailer',
'slack'
'mailer:"~>3"',
'slack:"~>3"'
] %}
RUN sensu-install --plugins {{ sensu_plugins | customizable('plugins') | join (',') }}

4
tests/templates/template_overrides.j2
View File

@ -26,8 +26,8 @@ RUN sed -i -e "/^mirrorlist/d" \
{% elif base_distro == 'oraclelinux' %}
{% endraw %}
RUN sed -i -e "s|^baseurl=http://yum.oracle.com/repo/OracleLinux|baseurl={{ nodepool_oraclelinux_proxy }}|" \
/etc/yum.repos.d/public-yum-ol7.repo
RUN sed -i -e "s|^baseurl=https://yum$ociregion.oracle.com/repo/OracleLinux|baseurl={{ nodepool_oraclelinux_proxy }}|" \
/etc/yum.repos.d/oracle-linux-ol7.repo
{% raw %}
{% endif %}