Merge "Remove live_migration_events"

This commit is contained in:
Zuul 2023-03-13 21:44:40 +00:00 committed by Gerrit Code Review
commit cb172e3c29
3 changed files with 5 additions and 19 deletions

View File

@ -69,14 +69,6 @@
# the keystone catalog.
# Defaults to $facts['os_service_default']
#
# DEPRECATED PARAMETERS
#
# [*live_migration_events*]
# (optional) When this option is enabled, during the live migration, the OVS
# agent will only send the "vif-plugged-event" when the destination host
# interface is bound.
# Defaults to $facts['os_service_default']
#
class neutron::server::notifications::nova (
$password,
$notify_nova_on_port_status_changes = $facts['os_service_default'],
@ -90,17 +82,10 @@ class neutron::server::notifications::nova (
$auth_url = 'http://127.0.0.1:5000',
$region_name = $facts['os_service_default'],
$endpoint_type = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$live_migration_events = undef,
) {
include neutron::deps
if $live_migration_events != undef {
warning('The live_migration_events parameter is deprecated \
and will be removed in a future release')
}
if is_service_default($system_scope) {
$project_name_real = $project_name
$project_domain_name_real = $project_domain_name
@ -123,7 +108,6 @@ and will be removed in a future release')
}
neutron_config {
'nova/live_migration_events': value => pick($live_migration_events, $facts['os_service_default']);
'DEFAULT/notify_nova_on_port_status_changes': value => $notify_nova_on_port_status_changes;
'DEFAULT/notify_nova_on_port_data_changes': value => $notify_nova_on_port_data_changes;
}

View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The ``neutron::server::notifications::nova::live_migration_events``
parameter has been removed.

View File

@ -36,7 +36,6 @@ describe 'neutron::server::notifications::nova' do
should contain_neutron_config('nova/auth_url').with_value('http://127.0.0.1:5000')
should contain_neutron_config('nova/region_name').with_value('<SERVICE DEFAULT>')
should contain_neutron_config('nova/endpoint_type').with_value('<SERVICE DEFAULT>')
should contain_neutron_config('nova/live_migration_events').with_value('<SERVICE DEFAULT>')
end
context 'when overriding parameters' do
@ -52,7 +51,6 @@ describe 'neutron::server::notifications::nova' do
:auth_url => 'http://keystone:5000/v3',
:region_name => 'MyRegion',
:endpoint_type => 'internal',
:live_migration_events => true,
)
end
@ -69,7 +67,6 @@ describe 'neutron::server::notifications::nova' do
should contain_neutron_config('nova/auth_url').with_value('http://keystone:5000/v3')
should contain_neutron_config('nova/region_name').with_value('MyRegion')
should contain_neutron_config('nova/endpoint_type').with_value('internal')
should contain_neutron_config('nova/live_migration_events').with_value(true)
end
end