openstack/puppet-trove
Code Issues Proposed changes

Drop notification options from guest agent

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

Change-Id: I39f7b54313322ac805a436d7b5635b7d0f9b3824
This commit is contained in:
Takashi Kajinami 2024-10-01 00:13:23 +09:00
parent a5f46b8752
commit b9ab772e98
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/guestagent.pp
View File

@ -162,12 +162,9 @@ class trove::guestagent(
rpc_response_timeout => $::trove::rpc_response_timeout, rpc_response_timeout => $::trove::rpc_response_timeout,
} }
oslo::messaging::notifications { 'trove_guestagent_config': # TODO(tkajinam): This is kept to purge unused options. Remove this after
transport_url => $::trove::notification_transport_url, # 2025.1 release
driver => $::trove::notification_driver, oslo::messaging::notifications { 'trove_guestagent_config': }
topics => $::trove::notification_topics,
retry => $::trove::notification_retry,
}
oslo::messaging::rabbit {'trove_guestagent_config': oslo::messaging::rabbit {'trove_guestagent_config':
rabbit_ha_queues => $::trove::rabbit_ha_queues, rabbit_ha_queues => $::trove::rabbit_ha_queues,

13
spec/classes/trove_guestagent_spec.rb
View File

@ -39,13 +39,6 @@ describe 'trove::guestagent' do
:rpc_response_timeout => '<SERVICE DEFAULT>', :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( is_expected.to contain_oslo__messaging__rabbit('trove_guestagent_config').with(
:rabbit_ha_queues => '<SERVICE DEFAULT>', :rabbit_ha_queues => '<SERVICE DEFAULT>',
:heartbeat_timeout_threshold => '<SERVICE DEFAULT>', :heartbeat_timeout_threshold => '<SERVICE DEFAULT>',
@ -229,8 +222,7 @@ describe 'trove::guestagent' do
context 'with transport_url entries' do context 'with transport_url entries' do
let :pre_condition do let :pre_condition do
"class { 'trove': "class { 'trove':
default_transport_url => 'rabbit://rabbit_user:password@localhost:5673', default_transport_url => 'rabbit://rabbit_user:password@localhost:5673',
notification_transport_url => 'rabbit://rabbit_user:password@localhost:5673'
} }
class { 'trove::guestagent::service_credentials': class { 'trove::guestagent::service_credentials':
password => 'verysectrete', password => 'verysectrete',
@ -241,9 +233,6 @@ describe 'trove::guestagent' do
is_expected.to contain_oslo__messaging__default('trove_guestagent_config').with( is_expected.to contain_oslo__messaging__default('trove_guestagent_config').with(
:transport_url => 'rabbit://rabbit_user:password@localhost:5673', :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 end
end end