From b9ab772e982c28332b65b9d14d15711d6b9f063e Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Tue, 1 Oct 2024 00:13:23 +0900
Subject: [PATCH] Drop notification options from guest agent

The trove-guest-agent service does not have implementations to send
notifications, so these options are not actually used.

Change-Id: I39f7b54313322ac805a436d7b5635b7d0f9b3824
---
 manifests/guestagent.pp               |  9 +++------
 spec/classes/trove_guestagent_spec.rb | 13 +------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/manifests/guestagent.pp b/manifests/guestagent.pp
index 42fb06a9..02a46767 100644
--- a/manifests/guestagent.pp
+++ b/manifests/guestagent.pp
@@ -162,12 +162,9 @@ class trove::guestagent(
     rpc_response_timeout => $::trove::rpc_response_timeout,
   }
 
-  oslo::messaging::notifications { 'trove_guestagent_config':
-    transport_url => $::trove::notification_transport_url,
-    driver        => $::trove::notification_driver,
-    topics        => $::trove::notification_topics,
-    retry         => $::trove::notification_retry,
-  }
+  # TODO(tkajinam): This is kept to purge unused options. Remove this after
+  #                 2025.1 release
+  oslo::messaging::notifications { 'trove_guestagent_config': }
 
   oslo::messaging::rabbit {'trove_guestagent_config':
     rabbit_ha_queues                => $::trove::rabbit_ha_queues,
diff --git a/spec/classes/trove_guestagent_spec.rb b/spec/classes/trove_guestagent_spec.rb
index 623101ed..a36ec69c 100644
--- a/spec/classes/trove_guestagent_spec.rb
+++ b/spec/classes/trove_guestagent_spec.rb
@@ -39,13 +39,6 @@ describe 'trove::guestagent' do
           :rpc_response_timeout => '<SERVICE DEFAULT>',
         )
 
-        is_expected.to contain_oslo__messaging__notifications('trove_guestagent_config').with(
-          :transport_url => '<SERVICE DEFAULT>',
-          :driver        => '<SERVICE DEFAULT>',
-          :topics        => '<SERVICE DEFAULT>',
-          :retry         => '<SERVICE DEFAULT>',
-        )
- 
         is_expected.to contain_oslo__messaging__rabbit('trove_guestagent_config').with(
           :rabbit_ha_queues                => '<SERVICE DEFAULT>',
           :heartbeat_timeout_threshold     => '<SERVICE DEFAULT>',
@@ -229,8 +222,7 @@ describe 'trove::guestagent' do
     context 'with transport_url entries' do
       let :pre_condition do
         "class { 'trove':
-           default_transport_url      => 'rabbit://rabbit_user:password@localhost:5673',
-           notification_transport_url => 'rabbit://rabbit_user:password@localhost:5673'
+           default_transport_url => 'rabbit://rabbit_user:password@localhost:5673',
          }
          class { 'trove::guestagent::service_credentials':
            password => 'verysectrete',
@@ -241,9 +233,6 @@ describe 'trove::guestagent' do
         is_expected.to contain_oslo__messaging__default('trove_guestagent_config').with(
           :transport_url => 'rabbit://rabbit_user:password@localhost:5673',
         )
-        is_expected.to contain_oslo__messaging__notifications('trove_guestagent_config').with(
-          :transport_url => 'rabbit://rabbit_user:password@localhost:5673',
-        )
       end
     end
   end