diff options
| author | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2022-05-26 10:27:53 +0200 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2022-05-29 18:14:01 +0000 |
| commit | 9d5bdbf36d477da38b0dd7d44b3fc6feb9325378 (patch) | |
| tree | b8d31d4c0150e73f21c4d3e7d8f0b794bd0ba6d4 /docker | |
| parent | a51ebc9e7fc2163623cb3d9b7540c23ea984c859 (diff) | |
| download | kolla-9d5bdbf36d477da38b0dd7d44b3fc6feb9325378.tar.gz kolla-9d5bdbf36d477da38b0dd7d44b3fc6feb9325378.zip | |
Use the new image naming scheme by default
Adds a relevant reno to inform users about the change and the
possibility to customise the prefix.
Additionally, this patch includes the fix to Ubuntu image builds
regarding rabbitmq and erlang.
Both the changes are required to fix master CI.
Change-Id: I6bc8b489a810849744c8bead6b9e350c5d3e36b7
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/843752
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index cf17be0f6..290e64b65 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -313,8 +313,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom ] %} {% set base_apt_keys = [ - {'name': 'erlang', 'keyid': 'F77F1EDA57EBB1CC'}, - {'name': 'rabbitmq', 'keyid': 'F6609E60DC62814E'}, + {'name': 'erlang', 'keyid': 'E495BB49CC4BBE5B'}, + {'name': 'rabbitmq', 'keyid': '9F4587F226208342'}, {'name': 'haproxy', 'keyid': 'CFFB779AADC995E4F350A060505D97A41C61B9CD'}, ] %} |