diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-09 20:34:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-09 20:34:09 +0000 |
| commit | 33bea9efeb22986f8a092b3e7b5ea79b058604fc (patch) | |
| tree | 99d0b424bc48bb0f88ff247105534191ca0c33f0 | |
| parent | 3883d3a01dec974b6b0bca7784a9989510cd7d92 (diff) | |
| parent | cdfa015dc97d4bc5bd4dc429e96d1981cfc8ea4b (diff) | |
| download | kolla-33bea9efeb22986f8a092b3e7b5ea79b058604fc.tar.gz kolla-33bea9efeb22986f8a092b3e7b5ea79b058604fc.zip | |
Merge "Follow up on RabbitMQ 3.8 upgrade"
| -rw-r--r-- | docker/base/apt_preferences.debian | 1 | ||||
| -rw-r--r-- | docker/base/apt_preferences.ubuntu | 1 | ||||
| -rw-r--r-- | docker/base/rabbitmq_rabbitmq-erlang-aarch64.repo | 1 | ||||
| -rw-r--r-- | docker/base/rabbitmq_rabbitmq-erlang.repo | 1 | ||||
| -rw-r--r-- | docker/base/rabbitmq_rabbitmq-server.repo | 5 |
5 files changed, 0 insertions, 9 deletions
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 1676a8fa8..a7497d6d8 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -8,7 +8,6 @@ Package: smartmontools Pin: version 7.* Pin-Priority: 1000 -# We do not pin minor versions anymore Package: rabbitmq-server Pin: version 3.8.* Pin-Priority: 1000 diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index db1c1d4ed..9792854d5 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -1,4 +1,3 @@ -# We do not pin minor versions anymore Package: rabbitmq-server Pin: version 3.8.* Pin-Priority: 1000 diff --git a/docker/base/rabbitmq_rabbitmq-erlang-aarch64.repo b/docker/base/rabbitmq_rabbitmq-erlang-aarch64.repo index a084c74c2..2d6b5b073 100644 --- a/docker/base/rabbitmq_rabbitmq-erlang-aarch64.repo +++ b/docker/base/rabbitmq_rabbitmq-erlang-aarch64.repo @@ -1,7 +1,6 @@ [rabbitmq_rabbitmq-erlang] name=rabbitmq_rabbitmq-erlang baseurl=http://obs.linaro.org/home:/marcin.juszkiewicz/centos$releasever/ -repo_gpgcheck=0 gpgcheck=1 enabled=0 gpgkey=http://obs.linaro.org/home:/marcin.juszkiewicz/centos$releasever/repodata/repomd.xml.key diff --git a/docker/base/rabbitmq_rabbitmq-erlang.repo b/docker/base/rabbitmq_rabbitmq-erlang.repo index a3ecea85c..c9d9aed42 100644 --- a/docker/base/rabbitmq_rabbitmq-erlang.repo +++ b/docker/base/rabbitmq_rabbitmq-erlang.repo @@ -1,7 +1,6 @@ [rabbitmq_rabbitmq-erlang] name=rabbitmq_rabbitmq-erlang baseurl=https://dl.bintray.com/rabbitmq-erlang/rpm/erlang/22/el/$releasever/ -repo_gpgcheck=0 gpgcheck=1 enabled=0 gpgkey=https://www.rabbitmq.com/rabbitmq-release-signing-key.asc diff --git a/docker/base/rabbitmq_rabbitmq-server.repo b/docker/base/rabbitmq_rabbitmq-server.repo index 2a04f4521..50f307d86 100644 --- a/docker/base/rabbitmq_rabbitmq-server.repo +++ b/docker/base/rabbitmq_rabbitmq-server.repo @@ -1,11 +1,6 @@ [rabbitmq_rabbitmq-server] name=rabbitmq_rabbitmq-server baseurl=https://dl.bintray.com/rabbitmq/rpm/rabbitmq-server/v3.8.x/el/$releasever/ -# NOTE(mgoddard): rabbitmq-server 3.7 packages are not signed. Previously -# repo_gpgcheck was set to 1, but this breaks DNF which does not seem to accept -# keys imported by rpm --import for signing a repo (as opposed to packages). -# TODO(mgoddard): Set gpgcheck=1 for rabbitmq-server 3.8+ -repo_gpgcheck=0 gpgcheck=1 enabled=0 gpgkey=https://www.rabbitmq.com/rabbitmq-release-signing-key.asc |