From fb61ba7daccfe8b13eff3b773cc09d69aa0039e7 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 23 Mar 2021 22:05:10 +0100 Subject: [PATCH] enable 'libvirt' repo for images with python*-libvirt There are several images installing 'python3-libvirt' package. Which for Debian reside in 'libvirt' repo. So let's enable it where needed. Change-Id: I1c91d27f2578f5ca7c83c4747725b1d9371880b0 --- docker/ceilometer/ceilometer-compute/Dockerfile.j2 | 2 ++ docker/neutron/neutron-mlnx-agent/Dockerfile.j2 | 2 ++ docker/nova/nova-base/Dockerfile.j2 | 1 + docker/nova/nova-compute/Dockerfile.j2 | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index a02e99fdb5..e63d253b32 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -7,6 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} +{{ macros.enable_extra_repos(['libvirt']) }} + {% if install_type == 'binary' %} {% if base_package_type == 'rpm' %} {% set ceilometer_compute_packages = [ diff --git a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 b/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 index 1741d6199e..5e28049e0c 100644 --- a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 @@ -7,6 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} +{{ macros.enable_extra_repos(['libvirt']) }} + {% set neutron_mlnx_agent_packages = [ 'python3-libvirt', 'python3-ethtool', diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index 7cf5cd50ca..bded164f26 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -7,6 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} +{{ macros.enable_extra_repos(['libvirt']) }} {{ macros.configure_user(name='nova', groups='qemu') }} {% if install_type == 'binary' %} diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 724fda8713..3fa20eac06 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.enable_extra_repos(['ceph']) }} +{{ macros.enable_extra_repos(['ceph', 'libvirt']) }} {% if install_type == 'binary' %} {% if base_package_type == 'rpm' %}