diff options
| author | Zuul <zuul@review.opendev.org> | 2021-02-15 11:28:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-02-15 11:28:14 +0000 |
| commit | 12aae8ae9513c68e8a540541968b10316137dd6f (patch) | |
| tree | fead53c0eddbd5fc3e844284f92b6bcce83e2a21 | |
| parent | 552bd7c1efd3204157b20f39b5a62571e8b98d3e (diff) | |
| parent | 0e2c4f61f5fc9cf71aaf1196fcb73f5aaa6f712d (diff) | |
| download | kolla-12aae8ae9513c68e8a540541968b10316137dd6f.tar.gz kolla-12aae8ae9513c68e8a540541968b10316137dd6f.zip | |
Merge "Debian: use libvirt 7.0.0 from Linaro OBS repository"
| -rw-r--r-- | docker/base/apt_preferences.debian | 9 | ||||
| -rw-r--r-- | 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 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 diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index bea4da6a6..21d3452db 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" |