Add live_migration_timeout_action to nova::migration::libvirt
Change-Id: I4fd019d00d5cd36311a538c03dd529540c77f5dc
This commit is contained in:
parent
67cf7850b0
commit
4e562ece17
|
@ -51,6 +51,14 @@
|
|||
# to 0 to disable timeouts.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*live_migration_timeout_action*]
|
||||
# (optional) This option will be used to determine what action will be taken
|
||||
# against a VM after live_migration_completion_timeout expires. By default,
|
||||
# the live migrate operation will be aborted after completion timeout.
|
||||
# If it is set to force_complete, the compute service will either pause the
|
||||
# VM or trigger post-copy depending on if post copy is enabled and available
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*live_migration_permit_post_copy*]
|
||||
# (optional) This option allows nova to switch an on-going live migration
|
||||
# to post-copy mode, i.e., switch the active VM to the one on the destination
|
||||
|
@ -118,6 +126,7 @@ class nova::migration::libvirt(
|
|||
$live_migration_tunnelled = $::os_service_default,
|
||||
$live_migration_with_native_tls = $::os_service_default,
|
||||
$live_migration_completion_timeout = $::os_service_default,
|
||||
$live_migration_timeout_action = $::os_service_default,
|
||||
$live_migration_permit_post_copy = $::os_service_default,
|
||||
$live_migration_permit_auto_converge = $::os_service_default,
|
||||
$override_uuid = false,
|
||||
|
@ -187,6 +196,7 @@ class nova::migration::libvirt(
|
|||
'libvirt/live_migration_tunnelled': value => $live_migration_tunnelled;
|
||||
'libvirt/live_migration_with_native_tls': value => $live_migration_with_native_tls;
|
||||
'libvirt/live_migration_completion_timeout': value => $live_migration_completion_timeout;
|
||||
'libvirt/live_migration_timeout_action': value => $live_migration_timeout_action;
|
||||
'libvirt/live_migration_inbound_addr': value => $live_migration_inbound_addr;
|
||||
'libvirt/live_migration_permit_post_copy': value => $live_migration_permit_post_copy;
|
||||
'libvirt/live_migration_permit_auto_converge': value => $live_migration_permit_auto_converge;
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
features:
|
||||
- |
|
||||
Added parameter live_migration_timeout_action to nova::migration::libvirt.
|
|
@ -40,6 +40,7 @@ describe 'nova::migration::libvirt' do
|
|||
it { is_expected.to contain_nova_config('libvirt/live_migration_tunnelled').with_value('<SERVICE DEFAULT>') }
|
||||
it { is_expected.to contain_nova_config('libvirt/live_migration_with_native_tls').with_value('<SERVICE DEFAULT>') }
|
||||
it { is_expected.to contain_nova_config('libvirt/live_migration_completion_timeout').with_value('<SERVICE DEFAULT>') }
|
||||
it { is_expected.to contain_nova_config('libvirt/live_migration_timeout_action').with_value('<SERVICE DEFAULT>') }
|
||||
it { is_expected.to contain_nova_config('libvirt/live_migration_uri').with_value('qemu+tcp://%s/system') }
|
||||
it { is_expected.to contain_nova_config('libvirt/live_migration_inbound_addr').with_value('<SERVICE DEFAULT>')}
|
||||
it { is_expected.to contain_nova_config('libvirt/live_migration_permit_post_copy').with_value('<SERVICE DEFAULT>')}
|
||||
|
@ -105,10 +106,12 @@ describe 'nova::migration::libvirt' do
|
|||
{
|
||||
:live_migration_tunnelled => true,
|
||||
:live_migration_completion_timeout => '1500',
|
||||
:live_migration_timeout_action => 'force_complete',
|
||||
}
|
||||
end
|
||||
it { is_expected.to contain_nova_config('libvirt/live_migration_tunnelled').with(:value => true) }
|
||||
it { is_expected.to contain_nova_config('libvirt/live_migration_completion_timeout').with_value('1500') }
|
||||
it { is_expected.to contain_nova_config('libvirt/live_migration_timeout_action').with_value('force_complete') }
|
||||
end
|
||||
|
||||
context 'with live migration auto converge on' do
|
||||
|
|
Loading…
Reference in New Issue