diff --git a/manifests/init.pp b/manifests/init.pp index aebbbc2..87a29db 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -166,18 +166,6 @@ # (optional) Datasources types # Defaults to $facts['os_service_default'] # -# 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 vitrage ( $package_ensure = 'present', $default_transport_url = $facts['os_service_default'], @@ -212,8 +200,6 @@ class vitrage ( Boolean $purge_config = false, $snapshots_interval = $facts['os_service_default'], $types = $facts['os_service_default'], - # DEPRECATED PARAMETERS - $rabbit_heartbeat_in_pthread = undef, ) inherits vitrage::params { include vitrage::deps @@ -240,7 +226,6 @@ class vitrage ( enable_cancel_on_failover => $rabbit_enable_cancel_on_failover, heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold, heartbeat_rate => $rabbit_heartbeat_rate, - heartbeat_in_pthread => $rabbit_heartbeat_in_pthread, rabbit_use_ssl => $rabbit_use_ssl, kombu_reconnect_delay => $kombu_reconnect_delay, kombu_failover_strategy => $kombu_failover_strategy, diff --git a/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-a28b110aa63f2f8c.yaml b/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-a28b110aa63f2f8c.yaml new file mode 100644 index 0000000..e1fafc8 --- /dev/null +++ b/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-a28b110aa63f2f8c.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The ``vitrage::rabbit_heartbeat_in_pthread`` parameter has been removed. diff --git a/spec/classes/vitrage_init_spec.rb b/spec/classes/vitrage_init_spec.rb index cc8a49e..315b748 100644 --- a/spec/classes/vitrage_init_spec.rb +++ b/spec/classes/vitrage_init_spec.rb @@ -31,7 +31,6 @@ describe 'vitrage' do :rabbit_use_ssl => '', :heartbeat_timeout_threshold => '', :heartbeat_rate => '', - :heartbeat_in_pthread => nil, :kombu_reconnect_delay => '', :kombu_failover_strategy => '', :amqp_durable_queues => '', @@ -84,7 +83,6 @@ describe 'vitrage' do :rabbit_transient_queues_ttl => 60, :rabbit_heartbeat_timeout_threshold => '60', :rabbit_heartbeat_rate => '10', - :rabbit_heartbeat_in_pthread => true, :kombu_compression => 'gzip', :kombu_reconnect_delay => '5.0', :kombu_failover_strategy => 'shuffle', @@ -110,7 +108,6 @@ describe 'vitrage' do :rabbit_use_ssl => '', :heartbeat_timeout_threshold => '60', :heartbeat_rate => '10', - :heartbeat_in_pthread => true, :kombu_reconnect_delay => '5.0', :kombu_failover_strategy => 'shuffle', :amqp_durable_queues => true,