diff options
| author | Zuul <zuul@review.opendev.org> | 2021-03-25 20:18:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-03-25 20:18:35 +0000 |
| commit | 728f095fd9720c245fd08381e244c11fc6674bb4 (patch) | |
| tree | 28c6ec3e71f1191e49763ed3728c5c3c78214a7a /docker | |
| parent | ea51b70a136f49172f8956df0c52f50d0eb7f69e (diff) | |
| parent | fb61ba7daccfe8b13eff3b773cc09d69aa0039e7 (diff) | |
| download | kolla-728f095fd9720c245fd08381e244c11fc6674bb4.tar.gz kolla-728f095fd9720c245fd08381e244c11fc6674bb4.zip | |
Merge "enable 'libvirt' repo for images with python*-libvirt"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ceilometer/ceilometer-compute/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/neutron/neutron-mlnx-agent/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 2 |
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' %} |