Skip to content

Commit 4b32dd5

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Remove calls to libvirt repo"
2 parents a699013 + 66e27b3 commit 4b32dd5

File tree

6 files changed

+4
-8
lines changed

6 files changed

+4
-8
lines changed

docker/ceilometer/ceilometer-compute/Dockerfile.j2

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
77

88
{% import "macros.j2" as macros with context %}
99

10-
{{ macros.enable_extra_repos(['libvirt']) }}
11-
1210
{% if base_package_type == 'rpm' %}
1311
{% set ceilometer_compute_packages = [
1412
'python3-libvirt'

docker/masakari/masakari-monitors/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
77

88
{% import "macros.j2" as macros with context %}
99

10-
{{ macros.enable_extra_repos(['hacluster', 'libvirt']) }}
10+
{{ macros.enable_extra_repos(['hacluster']) }}
1111

1212
{% if base_package_type == 'rpm' %}
1313

docker/neutron/neutron-mlnx-agent/Dockerfile.j2

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
77

88
{% import "macros.j2" as macros with context %}
99

10-
{{ macros.enable_extra_repos(['libvirt']) }}
11-
1210
{% set neutron_mlnx_agent_packages = [
1311
'python3-libvirt',
1412
'python3-ethtool',

docker/nova/nova-base/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
77

88
{% import "macros.j2" as macros with context %}
99

10-
{{ macros.enable_extra_repos(['libvirt', 'openvswitch']) }}
10+
{{ macros.enable_extra_repos(['openvswitch']) }}
1111
{{ macros.configure_user(name='nova', groups='qemu') }}
1212

1313
{% if base_package_type == 'rpm' %}

docker/nova/nova-compute/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
77

88
{% import "macros.j2" as macros with context %}
99

10-
{{ macros.enable_extra_repos(['ceph', 'epel', 'libvirt']) }}
10+
{{ macros.enable_extra_repos(['ceph', 'epel']) }}
1111

1212
{% if base_package_type == 'rpm' %}
1313

docker/nova/nova-libvirt/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
99

1010
{{ macros.configure_user(name='nova', groups='qemu') }}
1111

12-
{{ macros.enable_extra_repos(['ceph', 'epel', 'libvirt', 'openvswitch']) }}
12+
{{ macros.enable_extra_repos(['ceph', 'epel', 'openvswitch']) }}
1313

1414
{% if base_package_type == 'rpm' %}
1515

0 commit comments

Comments
 (0)