openstack/puppet-nova
Code Issues Proposed changes

Merge "CentOS9: Fix unit tests related to mkisofs_cmd"

Browse Source
This commit is contained in:
Zuul
2021-12-23 08:46:59 +00:00
committed by Gerrit Code Review
parent 0e8903062f 4cd055026b
commit 17a9f3d88d
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spec/classes/nova_compute_spec.rb
View File

@@ -35,7 +35,7 @@ describe 'nova::compute' do
end end
it { is_expected.to contain_nova_config('DEFAULT/use_cow_images').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_nova_config('DEFAULT/use_cow_images').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('DEFAULT/mkisofs_cmd').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_nova_config('DEFAULT/mkisofs_cmd').with_value(platform_params[:mkisofs_cmd]) }
it { is_expected.to contain_nova_config('DEFAULT/force_raw_images').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_nova_config('DEFAULT/force_raw_images').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('DEFAULT/virt_mkfs').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_nova_config('DEFAULT/virt_mkfs').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('DEFAULT/reserved_host_memory_mb').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_nova_config('DEFAULT/reserved_host_memory_mb').with_value('<SERVICE DEFAULT>') }
@@ -457,24 +457,33 @@ describe 'nova::compute' do
case facts[:osfamily] case facts[:osfamily]
when 'Debian' when 'Debian'
let (:platform_params) do let (:platform_params) do
{ :nova_compute_package => 'nova-compute', {
:nova_compute_package => 'nova-compute',
:nova_compute_service => 'nova-compute', :nova_compute_service => 'nova-compute',
:mkisofs_package => 'genisoimage' } :mkisofs_package => 'genisoimage',
:mkisofs_cmd => '<SERVICE DEFAULT>'
}
end end
when 'RedHat' when 'RedHat'
let (:platform_params) do let (:platform_params) do
{ :nova_compute_package => 'openstack-nova-compute', {
:nova_compute_service => 'openstack-nova-compute' } :nova_compute_package => 'openstack-nova-compute',
:nova_compute_service => 'openstack-nova-compute'
}
end end
if facts[:operatingsystemmajrelease] > '8' if facts[:operatingsystemmajrelease] > '8'
before do before do
platform_params.merge!({ platform_params.merge!({
:mkisofs_package => 'xorriso' }) :mkisofs_package => 'xorriso',
:mkisofs_cmd => 'mkisofs'
})
end end
else else
before do before do
platform_params.merge!({ platform_params.merge!({
:mkisofs_package => 'genisoimage' }) :mkisofs_package => 'genisoimage',
:mkisofs_cmd => '<SERVICE DEFAULT>'
})
end end
end end
end end