Fix Ubuntu image builds
Regarding rabbitmq and erlang. Change-Id: I6bc8b489a810849744c8bead6b9e350c5d3e36b7
This commit is contained in:
parent
744f377a24
commit
240b3cf448
|
@ -312,8 +312,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{% set base_apt_keys = [
|
{% set base_apt_keys = [
|
||||||
{'name': 'erlang', 'keyid': 'F77F1EDA57EBB1CC'},
|
{'name': 'erlang', 'keyid': 'E495BB49CC4BBE5B'},
|
||||||
{'name': 'rabbitmq', 'keyid': 'F6609E60DC62814E'},
|
{'name': 'rabbitmq', 'keyid': '9F4587F226208342'},
|
||||||
{'name': 'haproxy', 'keyid': 'CFFB779AADC995E4F350A060505D97A41C61B9CD'},
|
{'name': 'haproxy', 'keyid': 'CFFB779AADC995E4F350A060505D97A41C61B9CD'},
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
|
|
|
@ -47,9 +47,8 @@ debian:
|
||||||
component: "main"
|
component: "main"
|
||||||
gpg_key: "elasticsearch.asc"
|
gpg_key: "elasticsearch.asc"
|
||||||
erlang:
|
erlang:
|
||||||
# NOTE(mnasiadka): Erlang repo - Debian Buster/Bullseye needs to use bionic as per RabbitMQ docs
|
url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/debian"
|
||||||
url: "http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu"
|
suite: "bullseye"
|
||||||
suite: "bionic"
|
|
||||||
component: "main"
|
component: "main"
|
||||||
gpg_key: "erlang.gpg"
|
gpg_key: "erlang.gpg"
|
||||||
grafana:
|
grafana:
|
||||||
|
@ -78,7 +77,7 @@ debian:
|
||||||
component: "main"
|
component: "main"
|
||||||
gpg_key: "mariadb.gpg"
|
gpg_key: "mariadb.gpg"
|
||||||
rabbitmq:
|
rabbitmq:
|
||||||
url: "https://packagecloud.io/rabbitmq/rabbitmq-server/debian/"
|
url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian"
|
||||||
suite: "bullseye"
|
suite: "bullseye"
|
||||||
component: "main"
|
component: "main"
|
||||||
gpg_key: "rabbitmq.gpg"
|
gpg_key: "rabbitmq.gpg"
|
||||||
|
@ -100,9 +99,8 @@ debian-aarch64:
|
||||||
component: "main"
|
component: "main"
|
||||||
gpg_key: "elasticsearch.asc"
|
gpg_key: "elasticsearch.asc"
|
||||||
erlang:
|
erlang:
|
||||||
# NOTE(mnasiadka): Erlang repo - Debian Buster/Bullseye needs to use bionic as per RabbitMQ docs
|
url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/debian"
|
||||||
url: "http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu"
|
suite: "bullseye"
|
||||||
suite: "bionic"
|
|
||||||
component: "main"
|
component: "main"
|
||||||
gpg_key: "erlang.gpg"
|
gpg_key: "erlang.gpg"
|
||||||
grafana:
|
grafana:
|
||||||
|
@ -131,7 +129,7 @@ debian-aarch64:
|
||||||
component: "main"
|
component: "main"
|
||||||
gpg_key: "mariadb.gpg"
|
gpg_key: "mariadb.gpg"
|
||||||
rabbitmq:
|
rabbitmq:
|
||||||
url: "https://packagecloud.io/rabbitmq/rabbitmq-server/debian/"
|
url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian"
|
||||||
suite: "bullseye"
|
suite: "bullseye"
|
||||||
component: "main"
|
component: "main"
|
||||||
gpg_key: "rabbitmq.gpg"
|
gpg_key: "rabbitmq.gpg"
|
||||||
|
@ -153,7 +151,7 @@ ubuntu:
|
||||||
component: "main"
|
component: "main"
|
||||||
gpg_key: "elasticsearch.asc"
|
gpg_key: "elasticsearch.asc"
|
||||||
erlang:
|
erlang:
|
||||||
url: "http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu"
|
url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu"
|
||||||
suite: "focal"
|
suite: "focal"
|
||||||
component: "main"
|
component: "main"
|
||||||
gpg_key: "erlang.gpg"
|
gpg_key: "erlang.gpg"
|
||||||
|
@ -188,7 +186,7 @@ ubuntu:
|
||||||
component: "main"
|
component: "main"
|
||||||
gpg_key: "mariadb.gpg"
|
gpg_key: "mariadb.gpg"
|
||||||
rabbitmq:
|
rabbitmq:
|
||||||
url: "https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/"
|
url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/ubuntu"
|
||||||
suite: "focal"
|
suite: "focal"
|
||||||
component: "main"
|
component: "main"
|
||||||
gpg_key: "rabbitmq.gpg"
|
gpg_key: "rabbitmq.gpg"
|
||||||
|
@ -210,7 +208,7 @@ ubuntu-aarch64:
|
||||||
component: "main"
|
component: "main"
|
||||||
gpg_key: "elasticsearch.asc"
|
gpg_key: "elasticsearch.asc"
|
||||||
erlang:
|
erlang:
|
||||||
url: "http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu"
|
url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu"
|
||||||
suite: "focal"
|
suite: "focal"
|
||||||
component: "main"
|
component: "main"
|
||||||
gpg_key: "erlang.gpg"
|
gpg_key: "erlang.gpg"
|
||||||
|
@ -240,7 +238,7 @@ ubuntu-aarch64:
|
||||||
component: "main"
|
component: "main"
|
||||||
gpg_key: "mariadb.gpg"
|
gpg_key: "mariadb.gpg"
|
||||||
rabbitmq:
|
rabbitmq:
|
||||||
url: "https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/"
|
url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/ubuntu"
|
||||||
suite: "focal"
|
suite: "focal"
|
||||||
component: "main"
|
component: "main"
|
||||||
gpg_key: "rabbitmq.gpg"
|
gpg_key: "rabbitmq.gpg"
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
Fixes the Debian and Ubuntu images to use rabbitmq and erlang from
|
||||||
|
cloudsmith so that the images are still buildable and use proper versions.
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The Debian and Ubuntu images use rabbitmq and erlang from cloudsmith now.
|
||||||
|
Operators might want to mirror/proxy this new source as it provides the
|
||||||
|
correct set of packages unlike the previous combination.
|
Loading…
Reference in New Issue