diff --git a/manifests/init.pp b/manifests/init.pp index 84e2146c..3ee464f4 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -189,18 +189,6 @@ # in the aodh config. # Defaults to false. # -# DEPRECATED PARAMETERS -# -# [*rabbit_heartbeat_in_pthread*] -# (Optional) EXPERIMENTAL: Run the health check heartbeat thread -# through a native python thread. By default if this -# option isn't provided the health check heartbeat will -# inherit the execution model from the parent process. By -# example if the parent process have monkey patched the -# stdlib by using eventlet/greenlet then the heartbeat -# will be run through a green thread. -# Defaults to undef -# class aodh ( $package_ensure = 'present', $alarm_history_time_to_live = $facts['os_service_default'], @@ -240,8 +228,6 @@ class aodh ( $notification_retry = $facts['os_service_default'], $enable_evaluation_results_metrics = $facts['os_service_default'], Boolean $purge_config = false, - # DEPRECATED PARAMETERS - $rabbit_heartbeat_in_pthread = undef, ) inherits aodh::params { include aodh::deps include aodh::db @@ -260,7 +246,6 @@ class aodh ( rabbit_ha_queues => $rabbit_ha_queues, heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold, heartbeat_rate => $rabbit_heartbeat_rate, - heartbeat_in_pthread => $rabbit_heartbeat_in_pthread, rabbit_qos_prefetch_count => $rabbit_qos_prefetch_count, rabbit_use_ssl => $rabbit_use_ssl, kombu_reconnect_delay => $kombu_reconnect_delay, diff --git a/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-abc9689af67a9ed3.yaml b/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-abc9689af67a9ed3.yaml new file mode 100644 index 00000000..4d7f339b --- /dev/null +++ b/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-abc9689af67a9ed3.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The ``aodh::rabbit_heartbeat_in_pthread`` parameter has been removed. diff --git a/spec/classes/aodh_init_spec.rb b/spec/classes/aodh_init_spec.rb index f607b752..fe6ad731 100644 --- a/spec/classes/aodh_init_spec.rb +++ b/spec/classes/aodh_init_spec.rb @@ -31,7 +31,6 @@ describe 'aodh' do :rabbit_use_ssl => '', :heartbeat_timeout_threshold => '', :heartbeat_rate => '', - :heartbeat_in_pthread => nil, :rabbit_qos_prefetch_count => '', :kombu_reconnect_delay => '', :kombu_failover_strategy => '', @@ -89,7 +88,6 @@ describe 'aodh' do :rabbit_use_ssl => true, :rabbit_heartbeat_timeout_threshold => '60', :rabbit_heartbeat_rate => '10', - :rabbit_heartbeat_in_pthread => true, :rabbit_qos_prefetch_count => 0, :kombu_reconnect_delay => '5.0', :amqp_durable_queues => true, @@ -133,7 +131,6 @@ describe 'aodh' do :rabbit_use_ssl => true, :heartbeat_timeout_threshold => '60', :heartbeat_rate => '10', - :heartbeat_in_pthread => true, :rabbit_qos_prefetch_count => 0, :kombu_reconnect_delay => '5.0', :amqp_durable_queues => true,