openstack/puppet-nova
Code Issues Proposed changes

Merge "Aceept array for [libvirt] cpu_model_extra_flags"

Browse Source
This commit is contained in:
Zuul
2022-03-16 21:45:14 +00:00
committed by Gerrit Code Review
parent 68ea6900d8 4441e2c0c7
commit e22b8002c7
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
manifests/compute/libvirt.pp
View File

@@ -396,12 +396,8 @@ class nova::compute::libvirt (
validate_legacy(Array, 'validate_array', $cpu_models)
# cpu_model param is only valid if cpu_mode=custom
# otherwise it should be commented out
if $cpu_mode_default == 'custom' {
if empty($cpu_models){
$cpu_models_real = $::os_service_default
} else {
$cpu_models_real = join($cpu_models, ',')
}
if $cpu_mode_default == 'custom' and !empty($cpu_models){
$cpu_models_real = join($cpu_models, ',')
} else {
if !empty($cpu_models) {
warning('$cpu_models requires that $cpu_mode => "custom" and will be ignored')
@@ -409,21 +405,21 @@ class nova::compute::libvirt (
$cpu_models_real = $::os_service_default
}
nova_config {
'libvirt/cpu_models': value => $cpu_models_real;
'libvirt/cpu_models': value => $cpu_models_real;
}
# cpu_model_extra_flags is only valid if cpu_mode!=none
# otherwise it should be commented out
if $cpu_mode_default != 'none' and $cpu_model_extra_flags {
validate_legacy(String, 'validate_string', $cpu_model_extra_flags)
nova_config {
'libvirt/cpu_model_extra_flags': value => $cpu_model_extra_flags;
}
$cpu_model_extra_flags_real = join(any2array($cpu_model_extra_flags), ',')
} else {
nova_config {
'libvirt/cpu_model_extra_flags': ensure => absent;
}
if $cpu_model_extra_flags {
warning('$cpu_model_extra_flags requires that $cpu_mode is not set to "none" and will be ignored')
}
$cpu_model_extra_flags_real = $::os_service_default
}
nova_config {
'libvirt/cpu_model_extra_flags': value => $cpu_model_extra_flags_real;
}
if size($disk_cachemodes) > 0 {

2
spec/classes/nova_compute_libvirt_spec.rb
View File

@@ -50,7 +50,7 @@ describe 'nova::compute::libvirt' do
it { is_expected.to contain_nova_config('libvirt/virt_type').with_value('kvm')}
it { is_expected.to contain_nova_config('libvirt/cpu_mode').with_value('host-model')}
it { is_expected.to contain_nova_config('libvirt/cpu_models').with_value('<SERVICE DEFAULT>')}
it { is_expected.to contain_nova_config('libvirt/cpu_model_extra_flags').with_ensure('absent')}
it { is_expected.to contain_nova_config('libvirt/cpu_model_extra_flags').with_value('<SERVICE DEFAULT>')}
it { is_expected.to contain_nova_config('libvirt/snapshot_image_format').with_value('<SERVICE DEFAULT>')}
it { is_expected.to contain_nova_config('libvirt/snapshots_directory').with_value('<SERVICE DEFAULT>')}
it { is_expected.to contain_nova_config('libvirt/disk_cachemodes').with_ensure('absent')}