openstack
/
puppet-watcher
Code Issues Proposed changes

Merge "Remove support for amqp1 messaging driver"

This commit is contained in:
Zuul 2024-05-10 16:12:51 +00:00 committed by Gerrit Code Review
parent 4bbb1c65b8 fde8e96985
commit fb8848ae17
3 changed files with 4 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
manifests/init.pp
View File

@ -124,66 +124,6 @@
# option.
# Defaults to $facts['os_service_default']
#
# [*amqp_password*]
# (Optional) Password for message broker authentication.
# Defaults to $facts['os_service_default']
#
# [*amqp_username*]
# (Optional) User name for message broker authentication.
# Defaults to $facts['os_service_default']
#
# [*amqp_ssl_ca_file*]
# (Optional) CA certificate PEM file to verify server certificate.
# Defaults to $facts['os_service_default']
#
# [*amqp_ssl_key_file*]
# (Optional) Private key PEM file used to sign cert_file certificate.
# Defaults to $facts['os_service_default']
#
# [*amqp_container_name*]
# (Optional) Name for the AMQP container.
# Defaults to $facts['os_service_default']
#
# [*amqp_sasl_mechanisms*]
# (Optional) Space separated list of acceptable SASL mechanisms.
# Defaults to $facts['os_service_default']
#
# [*amqp_server_request_prefix*]
# (Optional) Address prefix used when sending to a specific server.
# Defaults to $facts['os_service_default']
#
# [*amqp_ssl_key_password*]
# (Optional) Password for decrypting ssl_key_file (if encrypted).
# Defaults to $facts['os_service_default']
#
# [*amqp_idle_timeout*]
# (Optional) Timeout for inactive connections (in seconds).
# Defaults to $facts['os_service_default']
#
# [*amqp_ssl_cert_file*]
# (Optional) Identifying certificate PEM file to present to clients.
# Defaults to $facts['os_service_default']
#
# [*amqp_broadcast_prefix*]
# (Optional) Address prefix used when broadcasting to all servers.
# Defaults to $facts['os_service_default']
#
# [*amqp_trace*]
# (Optional) Debug: dump AMQP frames to stdout.
# Defaults to $facts['os_service_default']
#
# [*amqp_sasl_config_name*]
# (Optional) Name of configuration file (without .conf suffix).
# Defaults to $facts['os_service_default']
#
# [*amqp_sasl_config_dir*]
# (Optional) Path to directory that contains the SASL configuration.
# Defaults to $facts['os_service_default']
#
# [*amqp_group_request_prefix*]
# (Optional) Address prefix when sending to any server in group.
# Defaults to $facts['os_service_default']
#
# [*notification_transport_url*]
# (optional) A URL representing the messaging driver to use for notifications
# and its full configuration. Transport URLs take the form:
@ -233,23 +173,6 @@ class watcher (
$default_transport_url = $facts['os_service_default'],
$rpc_response_timeout = $facts['os_service_default'],
$control_exchange = $facts['os_service_default'],
# amqp
$amqp_username = $facts['os_service_default'],
$amqp_password = $facts['os_service_default'],
$amqp_ssl_ca_file = $facts['os_service_default'],
$amqp_ssl_key_file = $facts['os_service_default'],
$amqp_container_name = $facts['os_service_default'],
$amqp_sasl_mechanisms = $facts['os_service_default'],
$amqp_server_request_prefix = $facts['os_service_default'],
$amqp_ssl_key_password = $facts['os_service_default'],
$amqp_idle_timeout = $facts['os_service_default'],
$amqp_ssl_cert_file = $facts['os_service_default'],
$amqp_broadcast_prefix = $facts['os_service_default'],
$amqp_trace = $facts['os_service_default'],
$amqp_sasl_config_name = $facts['os_service_default'],
$amqp_sasl_config_dir = $facts['os_service_default'],
$amqp_group_request_prefix = $facts['os_service_default'],
# messaging
$notification_transport_url = $facts['os_service_default'],
$notification_driver = $facts['os_service_default'],
$notification_topics = $facts['os_service_default'],
@ -294,24 +217,6 @@ class watcher (
heartbeat_in_pthread => $rabbit_heartbeat_in_pthread,
}
oslo::messaging::amqp { 'watcher_config':
username => $amqp_username,
password => $amqp_password,
server_request_prefix => $amqp_server_request_prefix,
broadcast_prefix => $amqp_broadcast_prefix,
group_request_prefix => $amqp_group_request_prefix,
container_name => $amqp_container_name,
idle_timeout => $amqp_idle_timeout,
trace => $amqp_trace,
ssl_ca_file => $amqp_ssl_ca_file,
ssl_cert_file => $amqp_ssl_cert_file,
ssl_key_file => $amqp_ssl_key_file,
ssl_key_password => $amqp_ssl_key_password,
sasl_mechanisms => $amqp_sasl_mechanisms,
sasl_config_dir => $amqp_sasl_config_dir,
sasl_config_name => $amqp_sasl_config_name,
}
oslo::messaging::default { 'watcher_config':
transport_url => $default_transport_url,
rpc_response_timeout => $rpc_response_timeout,

4
releasenotes/notes/remove-amqp1-368ef5ce07b3ce28.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
Support for amqp1 messaging driver has been removed.

68
spec/classes/watcher_init_spec.rb
View File

@ -48,22 +48,6 @@ describe 'watcher' do
:rabbit_ha_queues => '<SERVICE DEFAULT>',
:rabbit_retry_interval => '<SERVICE DEFAULT>',
)
is_expected.to contain_oslo__messaging__amqp('watcher_config').with(
:server_request_prefix => '<SERVICE DEFAULT>',
:broadcast_prefix => '<SERVICE DEFAULT>',
:group_request_prefix => '<SERVICE DEFAULT>',
:container_name => '<SERVICE DEFAULT>',
:idle_timeout => '<SERVICE DEFAULT>',
:trace => '<SERVICE DEFAULT>',
:ssl_ca_file => '<SERVICE DEFAULT>',
:ssl_cert_file => '<SERVICE DEFAULT>',
:ssl_key_file => '<SERVICE DEFAULT>',
:sasl_mechanisms => '<SERVICE DEFAULT>',
:sasl_config_dir => '<SERVICE DEFAULT>',
:sasl_config_name => '<SERVICE DEFAULT>',
:username => '<SERVICE DEFAULT>',
:password => '<SERVICE DEFAULT>',
)
is_expected.to contain_oslo__messaging__notifications('watcher_config').with(
:transport_url => '<SERVICE DEFAULT>',
:driver => '<SERVICE DEFAULT>',
@ -120,22 +104,6 @@ describe 'watcher' do
:rabbit_ha_queues => true,
:rabbit_retry_interval => '<SERVICE DEFAULT>',
)
is_expected.to contain_oslo__messaging__amqp('watcher_config').with(
:server_request_prefix => '<SERVICE DEFAULT>',
:broadcast_prefix => '<SERVICE DEFAULT>',
:group_request_prefix => '<SERVICE DEFAULT>',
:container_name => '<SERVICE DEFAULT>',
:idle_timeout => '<SERVICE DEFAULT>',
:trace => '<SERVICE DEFAULT>',
:ssl_ca_file => '<SERVICE DEFAULT>',
:ssl_cert_file => '<SERVICE DEFAULT>',
:ssl_key_file => '<SERVICE DEFAULT>',
:sasl_mechanisms => '<SERVICE DEFAULT>',
:sasl_config_dir => '<SERVICE DEFAULT>',
:sasl_config_name => '<SERVICE DEFAULT>',
:username => '<SERVICE DEFAULT>',
:password => '<SERVICE DEFAULT>',
)
is_expected.to contain_oslo__messaging__notifications('watcher_config').with(
:transport_url => 'rabbit://rabbit_user:password@localhost:5673',
:driver => 'messaging',
@ -180,42 +148,6 @@ describe 'watcher' do
)
end
end
context 'with overridden amqp parameters' do
let :params do
{ :default_transport_url => 'amqp://amqp_user:password@localhost:5672',
:amqp_idle_timeout => '60',
:amqp_trace => true,
:amqp_ssl_ca_file => '/etc/ca.cert',
:amqp_ssl_cert_file => '/etc/certfile',
:amqp_ssl_key_file => '/etc/key',
:amqp_username => 'amqp_user',
:amqp_password => 'password',
}
end
it 'configures amqp' do
is_expected.to contain_oslo__messaging__default('watcher_config').with(
:transport_url => 'amqp://amqp_user:password@localhost:5672',
)
is_expected.to contain_oslo__messaging__amqp('watcher_config').with(
:server_request_prefix => '<SERVICE DEFAULT>',
:broadcast_prefix => '<SERVICE DEFAULT>',
:group_request_prefix => '<SERVICE DEFAULT>',
:container_name => '<SERVICE DEFAULT>',
:idle_timeout => '60',
:trace => true,
:ssl_ca_file => '/etc/ca.cert',
:ssl_cert_file => '/etc/certfile',
:ssl_key_file => '/etc/key',
:sasl_mechanisms => '<SERVICE DEFAULT>',
:sasl_config_dir => '<SERVICE DEFAULT>',
:sasl_config_name => '<SERVICE DEFAULT>',
:username => 'amqp_user',
:password => 'password',
)
end
end
end
on_supported_os({