diff --git a/manifests/init.pp b/manifests/init.pp index 415cf44c..36cee989 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -179,18 +179,6 @@ # in the cinder config. # Defaults to false. # -# DEPECATED 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 barbican ( $package_ensure = 'present', $default_transport_url = undef, @@ -229,8 +217,6 @@ class barbican ( $kombu_failover_strategy = $facts['os_service_default'], $kombu_compression = $facts['os_service_default'], Boolean $purge_config = false, - # DEPRECATED PARAMETERS - $rabbit_heartbeat_in_pthread = undef, ) { include barbican::deps include barbican::params @@ -249,7 +235,6 @@ class barbican ( rabbit_use_ssl => $rabbit_use_ssl, 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, kombu_reconnect_delay => $kombu_reconnect_delay, kombu_failover_strategy => $kombu_failover_strategy, diff --git a/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-3a13722e1651b9aa.yaml b/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-3a13722e1651b9aa.yaml new file mode 100644 index 00000000..c60c6294 --- /dev/null +++ b/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-3a13722e1651b9aa.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The ``barbican::rabbit_heartbeat_in_pthread`` parameter has been removed. diff --git a/spec/classes/barbican_init_spec.rb b/spec/classes/barbican_init_spec.rb index 8cb97049..724c6f4a 100644 --- a/spec/classes/barbican_init_spec.rb +++ b/spec/classes/barbican_init_spec.rb @@ -49,7 +49,6 @@ describe 'barbican' do :rabbit_use_ssl => '', :heartbeat_timeout_threshold => '', :heartbeat_rate => '', - :heartbeat_in_pthread => nil, :rabbit_qos_prefetch_count => '', :kombu_reconnect_delay => '', :kombu_failover_strategy => '', @@ -85,7 +84,6 @@ describe 'barbican' do :rabbit_use_ssl => true, :rabbit_heartbeat_timeout_threshold => '10', :rabbit_heartbeat_rate => '10', - :rabbit_heartbeat_in_pthread => true, :rabbit_qos_prefetch_count => 0, :rabbit_ha_queues => true, :rabbit_quorum_queue => true, @@ -138,7 +136,6 @@ describe 'barbican' do :rabbit_use_ssl => params[:rabbit_use_ssl], :heartbeat_timeout_threshold => params[:rabbit_heartbeat_timeout_threshold], :heartbeat_rate => params[:rabbit_heartbeat_rate], - :heartbeat_in_pthread => params[:rabbit_heartbeat_in_pthread], :rabbit_qos_prefetch_count => params[:rabbit_qos_prefetch_count], :kombu_reconnect_delay => params[:kombu_reconnect_delay], :kombu_failover_strategy => params[:kombu_failover_strategy],