diff options
| author | Zuul <zuul@review.opendev.org> | 2021-05-07 19:32:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-05-07 19:32:21 +0000 |
| commit | 6dfae74813289575e77aaa7dfe43f7e6a81a5f26 (patch) | |
| tree | 3d5b7994784f363881cfbce96d1381e5cf9bd2ca /docker/base | |
| parent | ef0a578c48a2736a79f9f45e98604e536936882b (diff) | |
| parent | c028639af80f552304d45c48c25c1a27af10bb0c (diff) | |
| download | kolla-6dfae74813289575e77aaa7dfe43f7e6a81a5f26.tar.gz kolla-6dfae74813289575e77aaa7dfe43f7e6a81a5f26.zip | |
Merge "[release] Use UCA Wallaby"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/apt_preferences.ubuntu | 4 | ||||
| -rw-r--r-- | docker/base/sources.list.ubuntu | 2 | ||||
| -rw-r--r-- | docker/base/sources.list.ubuntu.aarch64 | 2 | ||||
| -rw-r--r-- | docker/base/sources.list.ubuntu.ppc64le | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index c8e36affd..013acb3a0 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -5,3 +5,7 @@ Pin-Priority: 1000 Package: erlang* Pin: version 1:23.* Pin-Priority: 1000 + +Package: openvswitch* +Pin: version 2.13.* +Pin-Priority: 1000 diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index 224a572ec..d2bb68bad 100644 --- a/docker/base/sources.list.ubuntu +++ b/docker/base/sources.list.ubuntu @@ -10,7 +10,7 @@ deb http://archive.ubuntu.com/ubuntu/ focal-backports main universe # We need to add the repo for the updated packages they provide. The main ones # are qemu, libvirt, and openvswitch. -deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/victoria main +deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/wallaby 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 diff --git a/docker/base/sources.list.ubuntu.aarch64 b/docker/base/sources.list.ubuntu.aarch64 index 5f6c8f435..30e6968ff 100644 --- a/docker/base/sources.list.ubuntu.aarch64 +++ b/docker/base/sources.list.ubuntu.aarch64 @@ -8,7 +8,7 @@ deb http://ports.ubuntu.com/ focal-backports main universe # We need to add the repo for the updated packages they provide. The main ones # are qemu, libvirt, and openvswitch. -deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/victoria main +deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/wallaby 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 diff --git a/docker/base/sources.list.ubuntu.ppc64le b/docker/base/sources.list.ubuntu.ppc64le index 3dd0d5e7d..53339b6c9 100644 --- a/docker/base/sources.list.ubuntu.ppc64le +++ b/docker/base/sources.list.ubuntu.ppc64le @@ -8,7 +8,7 @@ deb http://ports.ubuntu.com/ focal-backports main universe # We need to add the repo for the updated packages they provide. The main ones # are qemu, libvirt, and openvswitch. -deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/victoria main +deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/wallaby 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 |