Merge "Add support for [libvirt] live_migration_parallel_connections"
This commit is contained in:
@@ -68,6 +68,10 @@
|
||||
# to 0 to disable timeouts.
|
||||
# Defaults to $facts['os_service_default']
|
||||
#
|
||||
# [*live_migration_parallel_connections*]
|
||||
# (optional) Number of parallel connections to QEMU during live migrations.
|
||||
# Defaults to $facts['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,
|
||||
@@ -183,6 +187,7 @@ class nova::migration::libvirt (
|
||||
$live_migration_downtime_steps = $facts['os_service_default'],
|
||||
$live_migration_downtime_delay = $facts['os_service_default'],
|
||||
$live_migration_completion_timeout = $facts['os_service_default'],
|
||||
$live_migration_parallel_connections = $facts['os_service_default'],
|
||||
$live_migration_timeout_action = $facts['os_service_default'],
|
||||
$live_migration_permit_post_copy = $facts['os_service_default'],
|
||||
$live_migration_permit_auto_converge = $facts['os_service_default'],
|
||||
@@ -245,6 +250,7 @@ class nova::migration::libvirt (
|
||||
'libvirt/live_migration_downtime_steps': value => $live_migration_downtime_steps;
|
||||
'libvirt/live_migration_downtime_delay': value => $live_migration_downtime_delay;
|
||||
'libvirt/live_migration_completion_timeout': value => $live_migration_completion_timeout;
|
||||
'libvirt/live_migration_parallel_connections': value => $live_migration_parallel_connections;
|
||||
'libvirt/live_migration_timeout_action': value => $live_migration_timeout_action;
|
||||
'libvirt/live_migration_inbound_addr': value => $live_migration_inbound_addr;
|
||||
'libvirt/live_migration_scheme': value => $live_migration_scheme;
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
The new ``nova::migration::libvirt::live_migration_parallel_connections``
|
||||
parameter has been added.
|
||||
@@ -47,6 +47,7 @@ describe 'nova::migration::libvirt' do
|
||||
it { is_expected.to contain_nova_config('libvirt/live_migration_downtime_steps').with_value('<SERVICE DEFAULT>') }
|
||||
it { is_expected.to contain_nova_config('libvirt/live_migration_downtime_delay').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_parallel_connections').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('<SERVICE DEFAULT>') }
|
||||
it { is_expected.to contain_nova_config('libvirt/live_migration_inbound_addr').with_value('<SERVICE DEFAULT>')}
|
||||
@@ -137,7 +138,8 @@ describe 'nova::migration::libvirt' do
|
||||
:live_migration_downtime => 800,
|
||||
:live_migration_downtime_steps => 15,
|
||||
:live_migration_downtime_delay => 5,
|
||||
:live_migration_completion_timeout => '1500',
|
||||
:live_migration_completion_timeout => 1500,
|
||||
:live_migration_parallel_connections => 1,
|
||||
:live_migration_timeout_action => 'force_complete',
|
||||
})
|
||||
end
|
||||
@@ -146,7 +148,8 @@ describe 'nova::migration::libvirt' do
|
||||
it { is_expected.to contain_nova_config('libvirt/live_migration_downtime').with_value(800) }
|
||||
it { is_expected.to contain_nova_config('libvirt/live_migration_downtime_steps').with_value(15) }
|
||||
it { is_expected.to contain_nova_config('libvirt/live_migration_downtime_delay').with_value(5) }
|
||||
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_completion_timeout').with_value(1500) }
|
||||
it { is_expected.to contain_nova_config('libvirt/live_migration_parallel_connections').with_value(1) }
|
||||
it { is_expected.to contain_nova_config('libvirt/live_migration_timeout_action').with_value('force_complete') }
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user