openstack
/
puppet-swift
Code Issues Proposed changes

Remove support for amqp1 messaging driver 

The base implementation in puppet-oslo was deprecated during the 2023.2
cycle[1], so can be removed now.

[1] e174113210699b433dbae4c2c5a68bc3d269b5c3

Change-Id: I233cf0d5048db44df5c77cb509a1bca4e89555da
This commit is contained in:
Takashi Kajinami 2024-05-08 17:07:40 +09:00
parent f07444d3c4
commit 8476a1914e
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
manifests/proxy/ceilometer.pp
View File

@ -84,10 +84,6 @@
# (optional) SSL key file. (string value)
# 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'].
#
# [*rabbit_use_ssl*]
# (Optional) Connect over SSL for RabbitMQ. (boolean value)
# Defaults to $facts['os_service_default']
@ -149,6 +145,12 @@
# (string value)
# Defaults to $facts['os_service_default']
#
# DEPRECATED PARAMETERS
#
# [*amqp_ssl_key_password*]
# (Optional) Password for decrypting ssl_key_file (if encrypted)
# Defaults to undef
#
# == Examples
#
# == Authors
@ -179,7 +181,6 @@ class swift::proxy::ceilometer(
$notification_ssl_ca_file = $facts['os_service_default'],
$notification_ssl_cert_file = $facts['os_service_default'],
$notification_ssl_key_file = $facts['os_service_default'],
$amqp_ssl_key_password = $facts['os_service_default'],
$rabbit_use_ssl = $facts['os_service_default'],
$kombu_ssl_version = $facts['os_service_default'],
$rabbit_ha_queues = $facts['os_service_default'],
@ -191,11 +192,18 @@ class swift::proxy::ceilometer(
$kombu_reconnect_delay = $facts['os_service_default'],
$kombu_failover_strategy = $facts['os_service_default'],
$kombu_compression = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$amqp_ssl_key_password = undef
) inherits swift {
include swift::deps
include swift::params
# TODO(tkajinam): Remove this after 2025.1 release
if $amqp_ssl_key_password != undef {
warning('The amqp_ssl_key_password parameter has been deprecated and has no effect.')
}
Package['python-ceilometermiddleware'] ~> Service<| title == 'swift-proxy-server' |>
if is_service_default($system_scope) {
@ -254,19 +262,11 @@ class swift::proxy::ceilometer(
kombu_failover_strategy => $kombu_failover_strategy,
kombu_compression => $kombu_compression,
}
oslo::messaging::amqp { 'swift_ceilometer_config': }
} elsif $default_transport_url =~ /^amqp.*/ {
oslo::messaging::rabbit { 'swift_ceilometer_config': }
oslo::messaging::amqp { 'swift_ceilometer_config':
ssl_ca_file => $notification_ssl_ca_file,
ssl_cert_file => $notification_ssl_cert_file,
ssl_key_file => $notification_ssl_key_file,
ssl_key_password => $amqp_ssl_key_password,
}
# TODO(tkajinam): Remove this check after 2025.1 release
fail('apqm1 driver support has been removed.')
} else {
oslo::messaging::rabbit { 'swift_ceilometer_config': }
oslo::messaging::amqp { 'swift_ceilometer_config': }
}
package { 'python-ceilometermiddleware':

9
releasenotes/notes/remove-amqp1-2736619e17ce8b1e.yaml Normal file
View File

@ -0,0 +1,9 @@
---
upgrade:
- |
Support for amqp1 messaging driver by the ``swift::proxy::ceilometer``
class has been removed.
- |
The ``swift::proxy::ceilometer::amqp_ssl_key_password`` parameter has
been deprecated and has no effect now.

1
spec/classes/swift_proxy_ceilometer_spec.rb
View File

@ -93,7 +93,6 @@ describe 'swift::proxy::ceilometer' do
:kombu_failover_strategy => '<SERVICE DEFAULT>',
:kombu_compression => '<SERVICE DEFAULT>',
)}
it { is_expected.to contain_oslo__messaging__amqp('swift_ceilometer_config') }
context 'with overridden rabbit ssl params' do
before do