diff --git a/manifests/migration/libvirt.pp b/manifests/migration/libvirt.pp index 75c85eeda..94140fcd0 100644 --- a/manifests/migration/libvirt.pp +++ b/manifests/migration/libvirt.pp @@ -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; diff --git a/releasenotes/notes/live_migration_parallel_connections-5f21da8af9d1416e.yaml b/releasenotes/notes/live_migration_parallel_connections-5f21da8af9d1416e.yaml new file mode 100644 index 000000000..f306656c3 --- /dev/null +++ b/releasenotes/notes/live_migration_parallel_connections-5f21da8af9d1416e.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``nova::migration::libvirt::live_migration_parallel_connections`` + parameter has been added. diff --git a/spec/classes/nova_migration_libvirt_spec.rb b/spec/classes/nova_migration_libvirt_spec.rb index df46b098d..ceed88061 100644 --- a/spec/classes/nova_migration_libvirt_spec.rb +++ b/spec/classes/nova_migration_libvirt_spec.rb @@ -47,6 +47,7 @@ describe 'nova::migration::libvirt' do it { is_expected.to contain_nova_config('libvirt/live_migration_downtime_steps').with_value('') } it { is_expected.to contain_nova_config('libvirt/live_migration_downtime_delay').with_value('') } it { is_expected.to contain_nova_config('libvirt/live_migration_completion_timeout').with_value('') } + it { is_expected.to contain_nova_config('libvirt/live_migration_parallel_connections').with_value('') } it { is_expected.to contain_nova_config('libvirt/live_migration_timeout_action').with_value('') } it { is_expected.to contain_nova_config('libvirt/live_migration_uri').with_value('') } it { is_expected.to contain_nova_config('libvirt/live_migration_inbound_addr').with_value('')} @@ -132,13 +133,14 @@ describe 'nova::migration::libvirt' do context 'with migration flags set' do before :each do params.merge!({ - :live_migration_tunnelled => true, - :live_migration_bandwidth => 1024, - :live_migration_downtime => 800, - :live_migration_downtime_steps => 15, - :live_migration_downtime_delay => 5, - :live_migration_completion_timeout => '1500', - :live_migration_timeout_action => 'force_complete', + :live_migration_tunnelled => true, + :live_migration_bandwidth => 1024, + :live_migration_downtime => 800, + :live_migration_downtime_steps => 15, + :live_migration_downtime_delay => 5, + :live_migration_completion_timeout => 1500, + :live_migration_parallel_connections => 1, + :live_migration_timeout_action => 'force_complete', }) end it { is_expected.to contain_nova_config('libvirt/live_migration_tunnelled').with(:value => true) } @@ -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