From fa9794f29263544567aa1c58c2404054a918352a Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 13 Mar 2023 10:45:06 +0900
Subject: [PATCH] Remove live_migration_events

This option was introduced as a temporal workaround, and was removed
during Zed cycle by [1]

Depends-on: https://review.opendev.org/c/openstack/neutron/+/840448
Change-Id: Idd9d0cfb2dbddebee2e10e89bc6c02658374edaa
---
 manifests/server/notifications/nova.pp           | 16 ----------------
 ...e-live_migration_events-d5f225e7facf3480.yaml |  5 +++++
 .../neutron_server_notifications_nova_spec.rb    |  3 ---
 3 files changed, 5 insertions(+), 19 deletions(-)
 create mode 100644 releasenotes/notes/remove-live_migration_events-d5f225e7facf3480.yaml

diff --git a/manifests/server/notifications/nova.pp b/manifests/server/notifications/nova.pp
index 05a3d6c42..cc5e6fcf2 100644
--- a/manifests/server/notifications/nova.pp
+++ b/manifests/server/notifications/nova.pp
@@ -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;
   }
diff --git a/releasenotes/notes/remove-live_migration_events-d5f225e7facf3480.yaml b/releasenotes/notes/remove-live_migration_events-d5f225e7facf3480.yaml
new file mode 100644
index 000000000..f3eaca4eb
--- /dev/null
+++ b/releasenotes/notes/remove-live_migration_events-d5f225e7facf3480.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``neutron::server::notifications::nova::live_migration_events``
+    parameter has been removed.
diff --git a/spec/classes/neutron_server_notifications_nova_spec.rb b/spec/classes/neutron_server_notifications_nova_spec.rb
index a57a10934..48b7037b0 100644
--- a/spec/classes/neutron_server_notifications_nova_spec.rb
+++ b/spec/classes/neutron_server_notifications_nova_spec.rb
@@ -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