diff options
| -rw-r--r-- | docker/ceilometer/ceilometer-compute/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/masakari/masakari-monitors/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/neutron/neutron-mlnx-agent/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 2 |
6 files changed, 4 insertions, 8 deletions
diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index 8421ab8ad..6387850c5 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -7,8 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.enable_extra_repos(['libvirt']) }} - {% if base_package_type == 'rpm' %} {% set ceilometer_compute_packages = [ 'python3-libvirt' diff --git a/docker/masakari/masakari-monitors/Dockerfile.j2 b/docker/masakari/masakari-monitors/Dockerfile.j2 index 1a4bb1092..f2c86edc9 100644 --- a/docker/masakari/masakari-monitors/Dockerfile.j2 +++ b/docker/masakari/masakari-monitors/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(['hacluster', 'libvirt']) }} +{{ macros.enable_extra_repos(['hacluster']) }} {% if base_package_type == 'rpm' %} diff --git a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 b/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 index ed02be1f8..d79be89af 100644 --- a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 @@ -7,8 +7,6 @@ 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 e01013ff1..f6556045d 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/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(['libvirt', 'openvswitch']) }} +{{ macros.enable_extra_repos(['openvswitch']) }} {{ macros.configure_user(name='nova', groups='qemu') }} {% if base_package_type == 'rpm' %} diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 085c5c331..bd8208f5a 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', 'epel', 'libvirt']) }} +{{ macros.enable_extra_repos(['ceph', 'epel']) }} {% if base_package_type == 'rpm' %} diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 5e9a021c2..b56e01d0c 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='nova', groups='qemu') }} -{{ macros.enable_extra_repos(['ceph', 'epel', 'libvirt', 'openvswitch']) }} +{{ macros.enable_extra_repos(['ceph', 'epel', 'openvswitch']) }} {% if base_package_type == 'rpm' %} |