openstack/puppet-nova
Code Issues Proposed changes

CentOS: Drop unused libvirt-daemon-config-nwfilter

Browse Source 
The package is no longer used by nova, since the firewall feature was
removed from nova during ussuri cycle[1].

[1] 9b321e41f60be5d4111c8312b40c826454386c53

Closes-Bug: #2067867
Change-Id: I9fb3193d10b8c23dcf7eb1d4549ee04776d9959d
(cherry picked from commit 7617973329)
This commit is contained in:
Takashi Kajinami 2024-06-03 16:01:16 +09:00
parent 7c996fb434
commit c2ab06c6a9
4 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/compute/libvirt/services.pp
View File

@ -99,15 +99,7 @@ class nova::compute::libvirt::services (
} }
if $libvirt_service_name { if $libvirt_service_name {
# libvirt-nwfilter
if $facts['os']['family'] == 'RedHat' { 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 { case $libvirt_virt_type {
'qemu': { 'qemu': {
$libvirt_package_name_real = "${::nova::params::libvirt_daemon_package_prefix}kvm" $libvirt_package_name_real = "${::nova::params::libvirt_daemon_package_prefix}kvm"

1
manifests/params.pp
View File

@ -26,7 +26,6 @@ class nova::params {
$libvirt_client_package_name = 'libvirt-client' $libvirt_client_package_name = 'libvirt-client'
$libvirt_daemon_package_name = 'libvirt-daemon' $libvirt_daemon_package_name = 'libvirt-daemon'
$libvirt_daemon_package_prefix = 'libvirt-daemon-' $libvirt_daemon_package_prefix = 'libvirt-daemon-'
$libvirt_nwfilter_package_name = 'libvirt-daemon-config-nwfilter'
$scheduler_package_name = 'openstack-nova-scheduler' $scheduler_package_name = 'openstack-nova-scheduler'
$tgt_package_name = 'scsi-target-utils' $tgt_package_name = 'scsi-target-utils'
$vncproxy_package_name = 'openstack-nova-novncproxy' $vncproxy_package_name = 'openstack-nova-novncproxy'

5
releasenotes/notes/bug-2067867-2ad9041975cff1b2.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
The ``libvirt-daemon-config-nwfilter`` package is no longer installed,
because the package is no longer reuquired by nova.

8
spec/classes/nova_compute_libvirt_spec.rb
View File

@ -254,7 +254,6 @@ describe 'nova::compute::libvirt' do
it { is_expected.not_to contain_package('libvirt') } it { is_expected.not_to contain_package('libvirt') }
it { is_expected.not_to contain_service('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('virtlockd') }
it { is_expected.not_to contain_service('virtlogd') } it { is_expected.not_to contain_service('virtlogd') }
end end
@ -272,12 +271,6 @@ describe 'nova::compute::libvirt' do
:ensure => 'present', :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( it { is_expected.to contain_service('libvirt').with(
:name => 'libvirtd', :name => 'libvirtd',
:enable => true, :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_package('libvirt') }
it { is_expected.not_to contain_service('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('virtlockd') }
it { is_expected.not_to contain_service('virtlogd') } it { is_expected.not_to contain_service('virtlogd') }
end end