From fe1a64c61e8d389bd75bb47c58f8e2021667d31c Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 8 May 2024 12:34:30 +0900 Subject: [PATCH] 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: Ifb55059f65f7cf527f96550ec14160e98ac23a62 --- manifests/init.pp | 105 ------------------ .../notes/remove-amqp1-dad9d069b72e6458.yaml | 4 + spec/classes/ceilometer_init_spec.rb | 56 ---------- 3 files changed, 4 insertions(+), 161 deletions(-) create mode 100644 releasenotes/notes/remove-amqp1-dad9d069b72e6458.yaml diff --git a/manifests/init.pp b/manifests/init.pp index 82681222..633d2aa4 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -152,74 +152,6 @@ # (string value) # 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_broadcast_prefix*] -# (Optional) address prefix used when broadcasting to all servers -# 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']. -# -# [*amqp_container_name*] -# (Optional) Name for the AMQP container -# Defaults to $facts['os_service_default']. -# -# [*amqp_idle_timeout*] -# (Optional) Timeout for inactive connections -# Defaults to $facts['os_service_default']. -# -# [*amqp_trace*] -# (Optional) Debug: dump AMQP frames to stdout -# Defaults to $facts['os_service_default']. -# -# [*amqp_rpc_address_prefix*] -# (Optional) Address prefix for Ceilometer generated RPC addresses -# Defaults to $facts['os_service_default']. -# -# [*amqp_notify_address_prefix*] -# (Optional) Address prefix for Ceilometer generated Notification addresses -# 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_cert_file*] -# (Optional) Identifying certificate PEM file to present to clients -# 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_ssl_key_password*] -# (Optional) Password for decrypting ssl_key_file (if encrypted) -# Defaults to $facts['os_service_default']. -# -# [*amqp_sasl_mechanisms*] -# (Optional) Space separated list of acceptable SASL mechanisms -# 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_sasl_config_name*] -# (Optional) Name of configuration file (without .conf suffix) -# Defaults to $facts['os_service_default']. -# -# [*amqp_username*] -# (Optional) User name for message broker authentication -# Defaults to $facts['os_service_default']. -# -# [*amqp_password*] -# (Optional) Password for message broker authentication -# Defaults to $facts['os_service_default']. -# # [*purge_config*] # (optional) Whether to set only the specified config options # in the ceilometer config. @@ -261,23 +193,6 @@ class ceilometer( $kombu_reconnect_delay = $facts['os_service_default'], $kombu_failover_strategy = $facts['os_service_default'], $kombu_compression = $facts['os_service_default'], - $amqp_server_request_prefix = $facts['os_service_default'], - $amqp_broadcast_prefix = $facts['os_service_default'], - $amqp_group_request_prefix = $facts['os_service_default'], - $amqp_container_name = $facts['os_service_default'], - $amqp_idle_timeout = $facts['os_service_default'], - $amqp_trace = $facts['os_service_default'], - $amqp_rpc_address_prefix = $facts['os_service_default'], - $amqp_notify_address_prefix = $facts['os_service_default'], - $amqp_ssl_ca_file = $facts['os_service_default'], - $amqp_ssl_cert_file = $facts['os_service_default'], - $amqp_ssl_key_file = $facts['os_service_default'], - $amqp_ssl_key_password = $facts['os_service_default'], - $amqp_sasl_mechanisms = $facts['os_service_default'], - $amqp_sasl_config_dir = $facts['os_service_default'], - $amqp_sasl_config_name = $facts['os_service_default'], - $amqp_username = $facts['os_service_default'], - $amqp_password = $facts['os_service_default'], Boolean $purge_config = false, $host = $facts['os_service_default'], ) { @@ -317,26 +232,6 @@ class ceilometer( rabbit_quorum_max_memory_bytes => $rabbit_quorum_max_memory_bytes, } - oslo::messaging::amqp { 'ceilometer_config': - 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, - rpc_address_prefix => $amqp_rpc_address_prefix, - notify_address_prefix => $amqp_notify_address_prefix, - 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, - username => $amqp_username, - password => $amqp_password, - } - # Once we got here, we can act as an honey badger on the rpc used. ceilometer_config { 'DEFAULT/http_timeout' : value => $http_timeout; diff --git a/releasenotes/notes/remove-amqp1-dad9d069b72e6458.yaml b/releasenotes/notes/remove-amqp1-dad9d069b72e6458.yaml new file mode 100644 index 00000000..69b968c2 --- /dev/null +++ b/releasenotes/notes/remove-amqp1-dad9d069b72e6458.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Support for amqp1 messaging driver has been removed. diff --git a/spec/classes/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb index b9a3bd93..e08b1a24 100644 --- a/spec/classes/ceilometer_init_spec.rb +++ b/spec/classes/ceilometer_init_spec.rb @@ -46,13 +46,7 @@ describe 'ceilometer' do it_configures 'rabbit with SSL support' it_configures 'rabbit without HA support' end - end - - context 'with amqp messaging' do - it_configures 'amqp support' - end - end shared_examples_for 'a ceilometer base installation' do @@ -239,56 +233,6 @@ describe 'ceilometer' do end end - shared_examples_for 'amqp support' do - context 'with default parameters' do - it { is_expected.to contain_oslo__messaging__amqp('ceilometer_config').with( - :server_request_prefix => '', - :broadcast_prefix => '', - :group_request_prefix => '', - :container_name => '', - :idle_timeout => '', - :trace => '', - :ssl_ca_file => '', - :ssl_cert_file => '', - :ssl_key_file => '', - :sasl_mechanisms => '', - :sasl_config_dir => '', - :sasl_config_name => '', - :username => '', - :password => '', - ) } - end - - context 'with overridden amqp parameters' do - before { params.merge!( - :amqp_idle_timeout => '60', - :amqp_trace => true, - :amqp_ssl_ca_file => '/path/to/ca.cert', - :amqp_ssl_cert_file => '/path/to/certfile', - :amqp_ssl_key_file => '/path/to/key', - :amqp_username => 'amqp_user', - :amqp_password => 'password', - ) } - - it { is_expected.to contain_oslo__messaging__amqp('ceilometer_config').with( - :server_request_prefix => '', - :broadcast_prefix => '', - :group_request_prefix => '', - :container_name => '', - :idle_timeout => '60', - :trace => true, - :ssl_ca_file => '/path/to/ca.cert', - :ssl_cert_file => '/path/to/certfile', - :ssl_key_file => '/path/to/key', - :sasl_mechanisms => '', - :sasl_config_dir => '', - :sasl_config_name => '', - :username => 'amqp_user', - :password => 'password', - ) } - end - end - on_supported_os({ :supported_os => OSDefaults.get_supported_os }).each do |os,facts|