summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin@juszkiewicz.com.pl>2021-03-23 22:05:10 +0100
committerMarcin Juszkiewicz <marcin@juszkiewicz.com.pl>2021-03-23 22:08:11 +0100
commitfb61ba7daccfe8b13eff3b773cc09d69aa0039e7 (patch)
tree7906a3121d5875453476cd65d6ef303c1d02e446 /docker
parent5c0c2d2448f88a82bcc29b6771f90202011cbb1b (diff)
downloadkolla-fb61ba7daccfe8b13eff3b773cc09d69aa0039e7.tar.gz
kolla-fb61ba7daccfe8b13eff3b773cc09d69aa0039e7.zip
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
Diffstat (limited to 'docker')
-rw-r--r--docker/ceilometer/ceilometer-compute/Dockerfile.j22
-rw-r--r--docker/neutron/neutron-mlnx-agent/Dockerfile.j22
-rw-r--r--docker/nova/nova-base/Dockerfile.j21
-rw-r--r--docker/nova/nova-compute/Dockerfile.j22
4 files changed, 6 insertions, 1 deletions
diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2
index a02e99fdb..e63d253b3 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 1741d6199..5e28049e0 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 7cf5cd50c..bded164f2 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 724fda871..3fa20eac0 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' %}