openstack/puppet-nova
Code Issues Proposed changes

Override default mkisofs_cmd in CentOS 9.

Browse Source 
In [1] the parameter mkisofs_cmd was introduced in puppet-nova to set
this parameter as CentOS Stream 9 requires a different value that the
default one.

This change overrides the default value in CentOS9 so that no
additional tuning is needed.

[1] https://review.opendev.org/c/openstack/puppet-nova/+/810932

Change-Id: Id35db695a350fccad74688c96555393d0c108a8b
This commit is contained in:
Takashi Kajinami
2021-11-15 23:30:16 +09:00
parent 277773b2c0
commit 39d2069119
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/compute.pp
View File

@@ -484,9 +484,20 @@ Use the same parameter in nova::api class.')
$::nova::block_device_allocate_retries_interval,
$block_device_allocate_retries_interval)
# NOTE(tkajinam): In some distros like CentOS9, the genisoimage command
# is no longer available and we should override
# the mkisofs_cmd parameter to use the available command
# instead of genisoimage. This can be removed once default
# in nova is updated.
if $::nova::params::mkisofs_cmd and is_service_default($mkisofs_cmd) {
$mkisofs_cmd_real = $::nova::params::mkisofs_cmd
} else {
$mkisofs_cmd_real = $mkisofs_cmd
}
nova_config {
'DEFAULT/use_cow_images': value => $use_cow_images;
'DEFAULT/mkisofs_cmd': value => $mkisofs_cmd;
'DEFAULT/mkisofs_cmd': value => $mkisofs_cmd_real;
'DEFAULT/force_raw_images': value => $force_raw_images;
'DEFAULT/virt_mkfs': value => $virt_mkfs;
'DEFAULT/reserved_host_memory_mb': value => $reserved_host_memory;

3
manifests/params.pp
View File

@@ -61,8 +61,10 @@ class nova::params {
$nova_group = 'nova'
if $::operatingsystemmajrelease >= '9' {
$mkisofs_package_name = 'xorriso'
$mkisofs_cmd = 'mkisofs'
} else {
$mkisofs_package_name = 'genisoimage'
$mkisofs_cmd = false
}
}
'Debian': {
@@ -79,6 +81,7 @@ class nova::params {
$tgt_package_name = 'tgt'
$ceph_client_package_name = 'ceph'
$mkisofs_package_name = 'genisoimage'
$mkisofs_cmd = false
# service names
$api_service_name = 'nova-api'
$compute_service_name = 'nova-compute'