openstack/puppet-nova
Code Issues Proposed changes

Remove logic for CentOS < 9

Browse Source 
... because RDO supports CentOS Stream 9 (aka CentOS 9) only since Zed.

Change-Id: I0ff6eb5da73d1be6fd8e5f1c8127f9b18116c7b9
This commit is contained in:
Takashi Kajinami
2022-11-21 17:50:50 +09:00
parent 69d4a6d51d
commit 610ae05f91
2 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/params.pp
View File

@@ -59,13 +59,8 @@ class nova::params {
$nova_api_wsgi_script_source = '/usr/bin/nova-api-wsgi'
$nova_metadata_wsgi_script_source = '/usr/bin/nova-metadata-wsgi'
$messagebus_service_name = 'dbus'
if versioncmp($::operatingsystemmajrelease, '9') >= 0 {
$mkisofs_package_name = 'xorriso'
$mkisofs_cmd = 'mkisofs'
} else {
$mkisofs_package_name = 'genisoimage'
$mkisofs_cmd = false
}
$mkisofs_package_name = 'xorriso'
$mkisofs_cmd = 'mkisofs'
}
'Debian': {
# package names

19
spec/classes/nova_compute_spec.rb
View File

@@ -369,24 +369,11 @@ describe 'nova::compute' do
let (:platform_params) do
{
:nova_compute_package => 'openstack-nova-compute',
:nova_compute_service => 'openstack-nova-compute'
:nova_compute_service => 'openstack-nova-compute',
:mkisofs_package => 'xorriso',
:mkisofs_cmd => 'mkisofs'
}
end
if facts[:operatingsystemmajrelease].to_i >= 9
before do
platform_params.merge!({
:mkisofs_package => 'xorriso',
:mkisofs_cmd => 'mkisofs'
})
end
else
before do
platform_params.merge!({
:mkisofs_package => 'genisoimage',
:mkisofs_cmd => '<SERVICE DEFAULT>'
})
end
end
end
it_behaves_like 'nova-compute'
end