openstack
/
puppet-nova
Code Issues Proposed changes

Merge "Fix libvirt version discovery for CentOS Stream" into stable/victoria

This commit is contained in:
Zuul 2021-02-02 22:21:24 +00:00 committed by Gerrit Code Review
parent eed4d2dc1b 936838c584
commit 86ccadcd80
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/compute/libvirt/version.pp
View File

@ -11,7 +11,7 @@ class nova::compute::libvirt::version {
'RedHat': { 'RedHat': {
case $facts['os']['name'] { case $facts['os']['name'] {
'RedHat', 'CentOS': { 'RedHat', 'CentOS': {
if versioncmp($facts['os']['release']['full'], '8.1') >= 0 { if versioncmp($facts['os']['release']['full'], '8') >= 0 {
$default = '5.6' $default = '5.6'
} elsif versioncmp($facts['os']['release']['full'], '7.6') >= 0 { } elsif versioncmp($facts['os']['release']['full'], '7.6') >= 0 {
$default = '4.5' $default = '4.5'

14
spec/classes/nova_compute_libvirt_spec.rb
View File

@ -219,7 +219,6 @@ describe 'nova::compute::libvirt' do
it { is_expected.to contain_class('nova::migration::libvirt')} it { is_expected.to contain_class('nova::migration::libvirt')}
it { is_expected.to contain_nova_config('vnc/server_listen').with_value('0.0.0.0')} it { is_expected.to contain_nova_config('vnc/server_listen').with_value('0.0.0.0')}
it { is_expected.to contain_file_line('/etc/default/libvirtd libvirtd opts').with(:line => libvirt_options) }
end end
context 'with vncserver_listen set to ::0' do context 'with vncserver_listen set to ::0' do
@ -230,17 +229,6 @@ describe 'nova::compute::libvirt' do
it { is_expected.to contain_class('nova::migration::libvirt')} it { is_expected.to contain_class('nova::migration::libvirt')}
it { is_expected.to contain_nova_config('vnc/server_listen').with_value('::0')} it { is_expected.to contain_nova_config('vnc/server_listen').with_value('::0')}
it { is_expected.to contain_file_line('/etc/default/libvirtd libvirtd opts').with(:line => libvirt_options) }
end
context 'with custom libvirt service name on Debian platforms' do
let :params do
{ :libvirt_service_name => 'libvirtd',
:vncserver_listen => '0.0.0.0',
:migration_support => true }
end
it { is_expected.to contain_file_line('/etc/default/libvirtd libvirtd opts').with(:line => libvirt_options) }
end end
end end
@ -351,7 +339,6 @@ describe 'nova::compute::libvirt' do
it { is_expected.to contain_class('nova::migration::libvirt')} it { is_expected.to contain_class('nova::migration::libvirt')}
it { is_expected.to contain_nova_config('vnc/server_listen').with_value('0.0.0.0')} it { is_expected.to contain_nova_config('vnc/server_listen').with_value('0.0.0.0')}
it { is_expected.to contain_file_line('/etc/sysconfig/libvirtd libvirtd args').with(:line => 'LIBVIRTD_ARGS="--listen"') }
end end
context 'with vncserver_listen set to ::0' do context 'with vncserver_listen set to ::0' do
@ -362,7 +349,6 @@ describe 'nova::compute::libvirt' do
it { is_expected.to contain_class('nova::migration::libvirt')} it { is_expected.to contain_class('nova::migration::libvirt')}
it { is_expected.to contain_nova_config('vnc/server_listen').with_value('::0')} it { is_expected.to contain_nova_config('vnc/server_listen').with_value('::0')}
it { is_expected.to contain_file_line('/etc/sysconfig/libvirtd libvirtd args').with(:line => 'LIBVIRTD_ARGS="--listen"') }
end end
end end