diff --git a/manifests/compute/libvirt/services.pp b/manifests/compute/libvirt/services.pp index 54fee1cbb..5e4ca2703 100644 --- a/manifests/compute/libvirt/services.pp +++ b/manifests/compute/libvirt/services.pp @@ -99,15 +99,7 @@ class nova::compute::libvirt::services ( } if $libvirt_service_name { - # libvirt-nwfilter if $facts['os']['family'] == 'RedHat' { - package { 'libvirt-nwfilter': - ensure => $ensure_package, - name => $::nova::params::libvirt_nwfilter_package_name, - before => Service['libvirt'], - tag => ['openstack', 'nova-support-package'], - } - case $libvirt_virt_type { 'qemu': { $libvirt_package_name_real = "${::nova::params::libvirt_daemon_package_prefix}kvm" diff --git a/manifests/params.pp b/manifests/params.pp index 441636b94..fbb07f74d 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -26,7 +26,6 @@ class nova::params { $libvirt_client_package_name = 'libvirt-client' $libvirt_daemon_package_name = 'libvirt-daemon' $libvirt_daemon_package_prefix = 'libvirt-daemon-' - $libvirt_nwfilter_package_name = 'libvirt-daemon-config-nwfilter' $scheduler_package_name = 'openstack-nova-scheduler' $tgt_package_name = 'scsi-target-utils' $vncproxy_package_name = 'openstack-nova-novncproxy' diff --git a/releasenotes/notes/bug-2067867-2ad9041975cff1b2.yaml b/releasenotes/notes/bug-2067867-2ad9041975cff1b2.yaml new file mode 100644 index 000000000..83b40410f --- /dev/null +++ b/releasenotes/notes/bug-2067867-2ad9041975cff1b2.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + The ``libvirt-daemon-config-nwfilter`` package is no longer installed, + because the package is no longer reuquired by nova. diff --git a/spec/classes/nova_compute_libvirt_spec.rb b/spec/classes/nova_compute_libvirt_spec.rb index aaa85bc17..a8ae31bab 100644 --- a/spec/classes/nova_compute_libvirt_spec.rb +++ b/spec/classes/nova_compute_libvirt_spec.rb @@ -254,7 +254,6 @@ describe 'nova::compute::libvirt' do it { is_expected.not_to contain_package('libvirt') } it { is_expected.not_to contain_service('libvirt') } - it { is_expected.not_to contain_package('libvirt-nwfilter') } it { is_expected.not_to contain_service('virtlockd') } it { is_expected.not_to contain_service('virtlogd') } end @@ -272,12 +271,6 @@ describe 'nova::compute::libvirt' do :ensure => 'present', ) } - it { is_expected.to contain_package('libvirt-nwfilter').with( - :name => 'libvirt-daemon-config-nwfilter', - :ensure => 'present', - :before => ['Service[libvirt]', 'Anchor[nova::install::end]'], - ) } - it { is_expected.to contain_service('libvirt').with( :name => 'libvirtd', :enable => true, @@ -354,7 +347,6 @@ describe 'nova::compute::libvirt' do it { is_expected.not_to contain_package('libvirt') } it { is_expected.not_to contain_service('libvirt') } - it { is_expected.not_to contain_package('libvirt-nwfilter') } it { is_expected.not_to contain_service('virtlockd') } it { is_expected.not_to contain_service('virtlogd') } end