From 0e2c4f61f5fc9cf71aaf1196fcb73f5aaa6f712d Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sat, 6 Feb 2021 11:25:47 +0100 Subject: [PATCH] Debian: use libvirt 7.0.0 from Linaro OBS repository Nova requires libvirt 6.0.0 or newer in Wallaby. So I backported 7.0.0 from Debian 'testing'. AArch64 and x86-64 are covered. Change-Id: Ia678cd43b5ce53aee528674280f674c596a278ff --- docker/base/apt_preferences.debian | 9 ++------- kolla/template/repos.yaml | 1 + 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 5b674fc281..8439698bb1 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 diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index bea4da6a62..21d3452dbf 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -55,6 +55,7 @@ debian: erlang: "deb https://dl.bintray.com/rabbitmq-erlang/debian/ buster erlang" 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/debian-buster ./" logstash: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ buster main"