openstack
/
puppet-nova
Code Issues Proposed changes

Merge "Add support for [workarounds] skip_hypervisor_version_check_on_lm"

This commit is contained in:
Zuul 2022-08-12 08:10:54 +00:00 committed by Gerrit Code Review
parent a5d0af0d73 33dffab3da
commit 5fe7c9ef87
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/workarounds.pp
View File

@ -33,6 +33,11 @@
# before compute nodes have been able to update their service record.
# Defaults to $::os_service_default
#
# [*skip_hypervisor_version_check_on_lm*]
# (Optional) When this is enabled, it will skip version-checking of
# hypervisors during live migration.
# Defaults to $::os_service_default
#
# DEPRECATED
#
# [*enable_numa_live_migration*]
@ -45,6 +50,7 @@ class nova::workarounds (
$enable_qemu_monitor_announce_self = $::os_service_default,
$wait_for_vif_plugged_event_during_hard_reboot = $::os_service_default,
$disable_compute_service_check_for_ffu = $::os_service_default,
$skip_hypervisor_version_check_on_lm = $::os_service_default,
# DEPRECATED PARAMETER
$enable_numa_live_migration = undef,
) {
@ -67,6 +73,8 @@ class nova::workarounds (
value => join(any2array($wait_for_vif_plugged_event_during_hard_reboot), ',');
'workarounds/disable_compute_service_check_for_ffu':
value => $disable_compute_service_check_for_ffu;
'workarounds/skip_hypervisor_version_check_on_lm':
value => $skip_hypervisor_version_check_on_lm;
}
}

5
releasenotes/notes/skip_hypervisor_version_check_on_lm-a33d7ac3d3e4a88f.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
The new ``nova::compute::skip_hypervisor_version_check_on_lm`` parameter
has been added.

3
spec/classes/nova_workarounds_spec.rb
View File

@ -15,6 +15,7 @@ describe 'nova::workarounds' do
it { is_expected.to contain_nova_config('workarounds/enable_qemu_monitor_announce_self').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('workarounds/wait_for_vif_plugged_event_during_hard_reboot').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('workarounds/disable_compute_service_check_for_ffu').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('workarounds/skip_hypervisor_version_check_on_lm').with_value('<SERVICE DEFAULT>') }
end
context 'with overridden parameters' do
@ -26,6 +27,7 @@ describe 'nova::workarounds' do
:enable_qemu_monitor_announce_self => true,
:wait_for_vif_plugged_event_during_hard_reboot => ['normal', 'direct'],
:disable_compute_service_check_for_ffu => true,
:skip_hypervisor_version_check_on_lm => true,
}
end
@ -35,6 +37,7 @@ describe 'nova::workarounds' do
it { is_expected.to contain_nova_config('workarounds/enable_qemu_monitor_announce_self').with_value(true) }
it { is_expected.to contain_nova_config('workarounds/wait_for_vif_plugged_event_during_hard_reboot').with_value('normal,direct') }
it { is_expected.to contain_nova_config('workarounds/disable_compute_service_check_for_ffu').with_value(true) }
it { is_expected.to contain_nova_config('workarounds/skip_hypervisor_version_check_on_lm').with_value(true) }
end
end