openstack
/
kolla
Code Issues Proposed changes

Merge "Pin erlang" into stable/wallaby

This commit is contained in:
Zuul 2021-04-29 09:56:59 +00:00 committed by Gerrit Code Review
parent 2397aedcbc 084dd5e4ec
commit 26ee859eaf
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/base/apt_preferences.ubuntu
View File

@ -1,3 +1,7 @@
Package: rabbitmq-server Package: rabbitmq-server
Pin: version 3.8.* Pin: version 3.8.*
Pin-Priority: 1000 Pin-Priority: 1000
Package: erlang*
Pin: version 1:23.*
Pin-Priority: 1000

1
docker/kolla-toolbox/Dockerfile.j2
View File

@ -19,6 +19,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set kolla_toolbox_packages = [ {% set kolla_toolbox_packages = [
'crudini', 'crudini',
'erlang-23.*',
'gcc', 'gcc',
'gdisk', 'gdisk',
'git', 'git',

1
docker/rabbitmq/Dockerfile.j2
View File

@ -15,6 +15,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set rabbitmq_packages = [ {% set rabbitmq_packages = [
'hostname', 'hostname',
'erlang-23.*',
'rabbitmq-server-3.8.*' 'rabbitmq-server-3.8.*'
] %} ] %}