From 051c308fc37b8e98c1d47155e702b6c6578fe3b2 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 10 May 2024 00:58:47 +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: Iec6d9b66e5c1087ae4688d83d6ec646db4a41f2a --- manifests/init.pp | 93 ------------------- .../notes/remove-amqp1-8ac4d653bb0889e4.yaml | 4 + spec/classes/heat_init_spec.rb | 56 ----------- 3 files changed, 4 insertions(+), 149 deletions(-) create mode 100644 releasenotes/notes/remove-amqp1-8ac4d653bb0889e4.yaml diff --git a/manifests/init.pp b/manifests/init.pp index f4958e54..fd62b831 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -122,66 +122,6 @@ # (Optional) Use durable queues in amqp. # 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_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']. -# # [*host*] # (Optional) Name of this node. This is typically a hostname, FQDN, or # IP address. @@ -287,21 +227,6 @@ class heat( $kombu_failover_strategy = $facts['os_service_default'], $kombu_compression = $facts['os_service_default'], $amqp_durable_queues = $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_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'], $host = $facts['os_service_default'], $flavor = $facts['os_service_default'], $region_name = $facts['os_service_default'], @@ -359,24 +284,6 @@ class heat( rabbit_quorum_max_memory_bytes => $rabbit_quorum_max_memory_bytes, } - oslo::messaging::amqp { 'heat_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, - 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, - } - heat_config { 'DEFAULT/host': value => $host; 'DEFAULT/max_template_size': value => $max_template_size; diff --git a/releasenotes/notes/remove-amqp1-8ac4d653bb0889e4.yaml b/releasenotes/notes/remove-amqp1-8ac4d653bb0889e4.yaml new file mode 100644 index 00000000..69b968c2 --- /dev/null +++ b/releasenotes/notes/remove-amqp1-8ac4d653bb0889e4.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Support for amqp1 messaging driver has been removed. diff --git a/spec/classes/heat_init_spec.rb b/spec/classes/heat_init_spec.rb index fe39f300..83c36825 100644 --- a/spec/classes/heat_init_spec.rb +++ b/spec/classes/heat_init_spec.rb @@ -43,10 +43,6 @@ describe 'heat' do it_configures 'with enable_stack_adopt and enable_stack_abandon set' it_configures 'with overridden messaging default parameters' it_configures 'with notification_driver set to a string' - - context 'with amqp messaging' do - it_configures 'amqp support' - end end shared_examples_for 'a heat base installation' do @@ -322,58 +318,6 @@ describe 'heat' do end end - shared_examples_for 'amqp support' do - context 'with default parameters' do - it { is_expected.to contain_oslo__messaging__amqp('heat_config').with( - :server_request_prefix => '', - :broadcast_prefix => '', - :group_request_prefix => '', - :container_name => '', - :idle_timeout => '', - :trace => '', - :ssl_ca_file => '', - :ssl_cert_file => '', - :ssl_key_file => '', - :ssl_key_password => '', - :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('heat_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', - :ssl_key_password => '', - :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|