diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-04-12 20:17:15 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-04-29 23:09:06 +0200 |
| commit | 62c8dc95bd79a1b72b8633712847d0ba44c89126 (patch) | |
| tree | 4176f7987e123feb10878faaa5e8d0273cd1dcbf | |
| parent | d7a377260fbfb045a4fa11c97a8701f9c7eb471c (diff) | |
| download | kolla-62c8dc95bd79a1b72b8633712847d0ba44c89126.tar.gz kolla-62c8dc95bd79a1b72b8633712847d0ba44c89126.zip | |
Debian: use Ussuri binary packages
There is a repo with binary packages for Ussuri. Let us use them instead
of Train ones.
amd64 only
Change-Id: I071eebc4f60094d881a68e201e8c3bb6e6742ff5
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/base/apt_preferences.debian | 5 | ||||
| -rw-r--r-- | docker/base/sources.list.debian | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index f083a17e5..a9ab2f58a 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -377,7 +377,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom {% set remote_apt_keys = [ 'https://download.docker.com/linux/debian/gpg', 'https://packages.grafana.com/gpg.key', - 'http://buster-train.debian.net/debian/dists/pubkey.gpg', + 'http://buster-ussuri.debian.net/debian/dists/pubkey.gpg', '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', diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index b42d817d1..181ce5718 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -36,3 +36,8 @@ Pin-Priority: 700 Package: *libvirt* Pin: release o=Debian,b=ppc64le Pin-Priority: 700 + +# ovn-host depends on openvswitch from buster +Package: openvswitch* +Pin: release n=buster +Pin-Priority: 700 diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian index 109ec3e1f..ccccf9a67 100644 --- a/docker/base/sources.list.debian +++ b/docker/base/sources.list.debian @@ -7,9 +7,9 @@ deb http://security.debian.org/debian-security buster/updates main # debian backports deb http://deb.debian.org/debian buster-backports main -# Buster - Train repos -deb http://buster-train.debian.net/debian buster-train-backports main -deb http://buster-train.debian.net/debian buster-train-backports-nochange main +# Buster - Ussuri repos +deb http://buster-ussuri.debian.net/debian buster-ussuri-backports main +deb http://buster-ussuri.debian.net/debian buster-ussuri-backports-nochange main # NOTE(hrw): repositories below are added into image when they are needed as # separate files in /etc/apt/sources.list.d/ directory. For that purpose they |