Browse Source

Merge "rabbitmq: Move to packagecloud"

changes/79/772479/35
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
44b193a2dc
6 changed files with 25 additions and 18 deletions
  1. +5
    -4
      docker/base/Dockerfile.j2
  2. +1
    -2
      docker/base/rabbitmq_rabbitmq-erlang.repo
  3. +1
    -2
      docker/base/rabbitmq_rabbitmq-server.repo
  4. +2
    -2
      docker/base/sources.list.ubuntu
  5. +10
    -8
      kolla/template/repos.yaml
  6. +6
    -0
      releasenotes/notes/rabbitmq-packagecloud-c009ff6d0d2bd02d.yaml

+ 5
- 4
docker/base/Dockerfile.j2 View File

@ -86,7 +86,7 @@ COPY dnf.conf /etc/dnf/dnf.conf
'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
'https://packages.grafana.com/gpg.key',
'https://repos.influxdata.com/influxdb.key',
'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc',
'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc',
'https://packages.treasuredata.com/GPG-KEY-td-agent',
] %}
{% elif base_arch == 'aarch64' %}
@ -99,7 +99,7 @@ COPY dnf.conf /etc/dnf/dnf.conf
{% set base_yum_repo_keys = [
'https://packages.grafana.com/gpg.key',
'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc',
'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc',
] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
#
@ -359,6 +359,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
{# 901F9177AB97ACBE -- Treasure Data, Inc (Treasure Agent Official Signing key) <support@treasure-data.com> #}
{# A20F259AEB9C94BB -- Sensuapp (Freight) <support@hw-ops.com> #}
{# F1656F24C74CD1D8 -- MariaDB Signing Key <signing-key@mariadb.org> #}
{# F77F1EDA57EBB1CC -- RabbitMQ Signing Key <info@rabbitmq.com> #}
{% set base_apt_keys = [
'391A9AA2147192839E9DB0315EDB1B62EC4926EA',
'46095ACC8548582C1A2699A9D27D666CD88E42B4',
@ -368,15 +369,16 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
'901F9177AB97ACBE',
'A20F259AEB9C94BB',
'F1656F24C74CD1D8',
'F77F1EDA57EBB1CC',
] %}
{% set remote_apt_keys = [
'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc',
'https://packages.grafana.com/gpg.key',
'https://repos.influxdata.com/influxdb.key',
] %}
{% elif base_distro == 'debian' %}
{% set base_apt_keys = [
'46095ACC8548582C1A2699A9D27D666CD88E42B4',
'F77F1EDA57EBB1CC',
] %}
{% set remote_apt_keys = [
'https://download.docker.com/linux/debian/gpg',
@ -385,7 +387,6 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
'https://packages.treasuredata.com/GPG-KEY-td-agent',
'https://repos.influxdata.com/influxdb.key',
'https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster/Release.key',
'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc',
] %}
{% endif %}


+ 1
- 2
docker/base/rabbitmq_rabbitmq-erlang.repo View File

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

+ 1
- 2
docker/base/rabbitmq_rabbitmq-server.repo View File

@ -1,6 +1,5 @@
[rabbitmq_rabbitmq-server]
name=rabbitmq_rabbitmq-server
baseurl=https://dl.bintray.com/rabbitmq/rpm/rabbitmq-server/v3.8.x/el/$releasever/
baseurl=https://packagecloud.io/rabbitmq/rabbitmq-server/el/8/$basearch
gpgcheck=1
enabled=0
gpgkey=https://www.rabbitmq.com/rabbitmq-release-signing-key.asc

+ 2
- 2
docker/base/sources.list.ubuntu View File

@ -34,10 +34,10 @@ deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/victoria main
#deb http://ppa.launchpad.net/qpid/released/ubuntu/ focal main
# rabbitmq repo
#deb https://dl.bintray.com/rabbitmq/debian/ focal main
#deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main
# erlang repo
#deb https://dl.bintray.com/rabbitmq-erlang/debian/ focal erlang
#deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu focal main
# erlang repo - aarch64 only
#deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/ubuntu-focal ./


+ 10
- 8
kolla/template/repos.yaml View File

@ -57,49 +57,51 @@ rhel:
opstools: "centos-opstools"
rabbitmq: "centos-rabbitmq-38"
# NOTE(mnasiadka): Erlang repo - Debian Buster/Bullseye needs to use bionic as per RabbitMQ docs
debian:
elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
erlang: "deb https://dl.bintray.com/rabbitmq-erlang/debian/ buster erlang"
erlang: "deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu bionic main"
grafana: "deb https://packages.grafana.com/oss/deb stable main"
influxdb: "deb https://repos.influxdata.com/debian buster stable"
libvirt: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz:/kolla-wallaby/debian-buster ./"
logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
kibana: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ buster main"
rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/debian/ buster main"
td-agent: "deb http://packages.treasuredata.com/4/debian/buster buster contrib"
debian-aarch64:
elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
erlang: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./"
erlang: "deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu bionic main"
grafana: "deb https://packages.grafana.com/oss/deb stable main"
influxdb: "deb https://repos.influxdata.com/debian buster stable"
logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
libvirt: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz:/kolla-wallaby/debian-buster ./"
rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ buster main"
rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/debian/ buster main"
td-agent: "deb http://packages.treasuredata.com/4/debian/buster buster contrib"
ubuntu:
elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
erlang: "deb https://dl.bintray.com/rabbitmq-erlang/debian/ focal erlang"
erlang: "deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu focal main"
grafana: "deb https://packages.grafana.com/oss/deb stable main"
influxdb: "deb https://repos.influxdata.com/ubuntu focal stable"
logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
kibana: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main"
qdrouterd: "deb http://ppa.launchpad.net/qpid/released/ubuntu/ focal main"
rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ focal main"
rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main"
td-agent: "deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib"
ubuntu-aarch64:
elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
erlang: "deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu focal main"
grafana: "deb https://packages.grafana.com/oss/deb stable main"
influxdb: "deb https://repos.influxdata.com/ubuntu focal stable"
logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main"
rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ focal main"
rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main"
td-agent: "deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib"
ubuntu-ppc64le:
mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main"
rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ focal main"
rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main"

+ 6
- 0
releasenotes/notes/rabbitmq-packagecloud-c009ff6d0d2bd02d.yaml View File

@ -0,0 +1,6 @@
---
upgrade:
- |
RabbitMQ and Erlang packages are now installed from ``packagecloud.io``
(and PPA for Debian/Ubuntu) since ``bintray.com`` is getting shut down
May 1st, 2021.

Loading…
Cancel
Save