aboutsummaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-02-15 11:28:14 +0000
committerGerrit Code Review <review@openstack.org>2021-02-15 11:28:14 +0000
commit12aae8ae9513c68e8a540541968b10316137dd6f (patch)
treefead53c0eddbd5fc3e844284f92b6bcce83e2a21 /docker/base
parent552bd7c1efd3204157b20f39b5a62571e8b98d3e (diff)
parent0e2c4f61f5fc9cf71aaf1196fcb73f5aaa6f712d (diff)
downloadkolla-12aae8ae9513c68e8a540541968b10316137dd6f.tar.gz
kolla-12aae8ae9513c68e8a540541968b10316137dd6f.zip
Merge "Debian: use libvirt 7.0.0 from Linaro OBS repository"
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/apt_preferences.debian9
1 files changed, 2 insertions, 7 deletions
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian
index 5b674fc28..8439698bb 100644
--- a/docker/base/apt_preferences.debian
+++ b/docker/base/apt_preferences.debian
@@ -22,17 +22,12 @@ Package: *
Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster
Pin-Priority: 100
-# We need fixed libvirt for aarch64
+# We need libvirt 7.0.0 for nova
Package: *libvirt*
Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster
Pin-Priority: 600
-# on x86-64 we want libvirt from Debian
-Package: *libvirt*
-Pin: release o=Debian,b=amd64
-Pin-Priority: 700
-
-# on ppc64le we want libvirt from Debian
+# on ppc64le we lack libvirt 7.0.0 so let fail with Debian one
Package: *libvirt*
Pin: release o=Debian,b=ppc64le
Pin-Priority: 700