Browse Source

Merge "Use upstream Erlang on CentOS 8" into stable/train

changes/36/750136/1
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
cd4d0ae1f9
5 changed files with 24 additions and 9 deletions
  1. +10
    -7
      docker/base/Dockerfile.j2
  2. +6
    -0
      docker/base/rabbitmq_rabbitmq-erlang.repo
  3. +1
    -1
      docker/bifrost/bifrost-base/Dockerfile.j2
  4. +1
    -1
      docker/rabbitmq/Dockerfile.j2
  5. +6
    -0
      releasenotes/notes/bug-1884034-328afb8831779e02.yaml

+ 10
- 7
docker/base/Dockerfile.j2 View File

@@ -86,6 +86,13 @@ COPY yum.conf /etc/yum.conf
'opendaylight.repo',
] %}
{% endif %}
# NOTE(yoctozepto): use upstream erlang on CentOS 8
# see https://launchpad.net/bugs/1884034
{% if distro_package_manager == 'dnf' %}
{% set base_yum_repo_files = base_yum_repo_files + [
'rabbitmq_rabbitmq-erlang.repo',
] %}
{% endif %}

{% set base_yum_repo_keys = [
'https://packages.grafana.com/gpg.key',
@@ -240,17 +247,13 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
'HighAvailability',
'PowerTools'
] %}
# NOTE(yoctozepto): use upstream rabbitmq (3.7) and erlang on CentOS 8
# see https://launchpad.net/bugs/1884034
{% set base_centos_yum_repos_to_disable = [
'centos-rabbitmq-38',
'epel',
'epel-modular',
] %}

# NOTE(hrw): no rabbitmq for aarch64 in CentOS 8.0/8.1
{% if base_arch == 'aarch64' %}
{% set base_centos_yum_repos_to_disable = base_centos_yum_repos_to_disable + [
'centos-rabbitmq-38'
] %}
{% endif %}
{% else %}
{% set base_centos_yum_repo_keys = base_centos_yum_repo_keys + [
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization',


+ 6
- 0
docker/base/rabbitmq_rabbitmq-erlang.repo View File

@@ -0,0 +1,6 @@
[rabbitmq_rabbitmq-erlang]
name=rabbitmq_rabbitmq-erlang
baseurl=https://dl.bintray.com/rabbitmq-erlang/rpm/erlang/22/el/$releasever/
gpgcheck=1
enabled=1
gpgkey=https://www.rabbitmq.com/rabbitmq-release-signing-key.asc

+ 1
- 1
docker/bifrost/bifrost-base/Dockerfile.j2 View File

@@ -28,7 +28,7 @@ WORKDIR /bifrost

{% if base_package_type == 'rpm' %}
{# Remove updated RabbitMQ packages since these are not supported by Bifrost yet. #}
RUN rm -f /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo \
RUN rm -f /etc/yum.repos.d/{rabbitmq_rabbitmq-server,rabbitmq_rabbitmq-erlang}.repo \
{%- if distro_package_manager == 'dnf' %}
&& dnf config-manager --enable epel \
{% else %}


+ 1
- 1
docker/rabbitmq/Dockerfile.j2 View File

@@ -10,7 +10,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block rabbitmq_install %}
{% if base_package_type == 'rpm' %}
{% set rabbitmq_packages = [
'erlang-hipe',
'hostname',
] %}
{% if distro_package_manager == 'dnf' %}
@@ -21,6 +20,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
# NOTE(mandre) Remove rabbitmq-server pinning once package dependencies are met
# https://bugs.launchpad.net/kolla/+bug/1814233
{% set rabbitmq_packages = rabbitmq_packages + [
'erlang-hipe',
'rabbitmq-server-3.7.10'
] %}
{% endif %}


+ 6
- 0
releasenotes/notes/bug-1884034-328afb8831779e02.yaml View File

@@ -0,0 +1,6 @@
---
fixes:
- |
Fixes mixed RabbitMQ and Erlang package sources on CentOS 8 (Train only).
Those could lead to RabbitMQ cluster instability in certain circumstances.
`LP#1884034 <https://launchpad.net/bugs/1884034>`__

Loading…
Cancel
Save