diff options
| author | Zuul <zuul@review.opendev.org> | 2020-09-04 11:06:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-09-04 11:06:35 +0000 |
| commit | cd4d0ae1f90665424ebd925f4f6dbcbc526709a2 (patch) | |
| tree | a9d38094a15b77d98f33a0eacb7b09ad354b506b /docker/base | |
| parent | 9d3bf5731f3678f7a6d76cfa11c755599fcc9527 (diff) | |
| parent | fec2c701dc36ea8d246b69290f5546bf37d414b3 (diff) | |
| download | kolla-cd4d0ae1f90665424ebd925f4f6dbcbc526709a2.tar.gz kolla-cd4d0ae1f90665424ebd925f4f6dbcbc526709a2.zip | |
Merge "Use upstream Erlang on CentOS 8" into stable/train
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 17 | ||||
| -rw-r--r-- | docker/base/rabbitmq_rabbitmq-erlang.repo | 6 |
2 files changed, 16 insertions, 7 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 50b3205a5..89e0ac874 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -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', diff --git a/docker/base/rabbitmq_rabbitmq-erlang.repo b/docker/base/rabbitmq_rabbitmq-erlang.repo new file mode 100644 index 000000000..acd5995c8 --- /dev/null +++ b/docker/base/rabbitmq_rabbitmq-erlang.repo @@ -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 |