openstack
/
puppet-nova
Code Issues Proposed changes

Deprecate live_migration_progress_timeout option 

migration::libvirt::live_migration_progress_timeout has been deprecated
as this feature has been found not to work. See bug 1644248 for more
details.

Change-Id: I860a3b3f8864b015befba7675236429d48d81420
Closes-Bug: #1691031
This commit is contained in:
ZhongShengping 2017-05-16 15:44:15 +08:00 committed by Alex Schultz
parent 07f91b1b29
commit 30b531327a
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
manifests/migration/libvirt.pp
View File

@ -44,12 +44,6 @@
# to 0 to disable timeouts.
# Defaults to $::os_service_default
#
# [*live_migration_progress_timeout*]
# (optional) Time to wait, in seconds, for migration to make forward progress
# in transferring data before aborting the operation. Set to 0 to disable
# timeouts.
# Defaults to $::os_service_default
#
# [*override_uuid*]
# (optional) Set uuid not equal to output from dmidecode (boolean)
# Defaults to false
@ -83,6 +77,12 @@
# Defaults to false
# Deprecated by transport paramater.
#
# [*live_migration_progress_timeout*]
# (optional) Time to wait, in seconds, for migration to make forward progress
# in transferring data before aborting the operation. Set to 0 to disable
# timeouts.
# Defaults to undef
#
class nova::migration::libvirt(
$transport = undef,
$auth = 'none',
@ -90,7 +90,6 @@ class nova::migration::libvirt(
$live_migration_inbound_addr = $::os_service_default,
$live_migration_tunnelled = $::os_service_default,
$live_migration_completion_timeout = $::os_service_default,
$live_migration_progress_timeout = $::os_service_default,
$override_uuid = false,
$configure_libvirt = true,
$configure_nova = true,
@ -99,6 +98,7 @@ class nova::migration::libvirt(
$client_extraparams = {},
# DEPRECATED PARAMETERS
$use_tls = false,
$live_migration_progress_timeout = undef,
){
include ::nova::deps
@ -114,6 +114,10 @@ class nova::migration::libvirt(
$transport_real = 'tcp'
}
if $live_migration_progress_timeout {
warning('live_migration_progress_timeout parameter is now deprecated and will be removed in the future release.')
}
validate_re($transport_real, ['^tcp$', '^tls$', '^ssh$'], 'Valid options for transport are tcp, tls, ssh.')
validate_re($auth, [ '^sasl$', '^none$' ], 'Valid options for auth are none and sasl.')
@ -165,7 +169,6 @@ class nova::migration::libvirt(
'libvirt/live_migration_uri': value => $live_migration_uri;
'libvirt/live_migration_tunnelled': value => $live_migration_tunnelled;
'libvirt/live_migration_completion_timeout': value => $live_migration_completion_timeout;
'libvirt/live_migration_progress_timeout': value => $live_migration_progress_timeout;
'libvirt/live_migration_inbound_addr': value => $live_migration_inbound_addr;
'libvirt/live_migration_scheme': value => $live_migration_scheme;
}

4
releasenotes/notes/deprecate_live_migration_progress_timeout-1892fd37e5761891.yaml Normal file
View File

@ -0,0 +1,4 @@
---
deprecations:
migration::libvirt::live_migration_progress_timeout has been deprecated as this
feature has been found not to work. See bug 1644248 for more details.

3
spec/classes/nova_migration_libvirt_spec.rb
View File

@ -46,7 +46,6 @@ describe 'nova::migration::libvirt' do
it { is_expected.to contain_file_line('/etc/libvirt/libvirtd.conf auth_tcp').with(:line => "auth_tcp = \"none\"") }
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_completion_timeout').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('libvirt/live_migration_progress_timeout').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_scheme').with_value('<SERVICE DEFAULT>')}
@ -118,12 +117,10 @@ describe 'nova::migration::libvirt' do
{
:live_migration_tunnelled => true,
:live_migration_completion_timeout => '1500',
:live_migration_progress_timeout => '1500',
}
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_progress_timeout').with_value('1500') }
end
context 'with auth set to sasl' do