diff --git a/manifests/proxy/ceilometer.pp b/manifests/proxy/ceilometer.pp index 2a59595c..51e102cd 100644 --- a/manifests/proxy/ceilometer.pp +++ b/manifests/proxy/ceilometer.pp @@ -161,18 +161,6 @@ # (string value) # 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 -# # == Examples # # == Authors @@ -218,8 +206,6 @@ class swift::proxy::ceilometer ( $kombu_reconnect_delay = $facts['os_service_default'], $kombu_failover_strategy = $facts['os_service_default'], $kombu_compression = $facts['os_service_default'], - # DEPRECATED PARAMETERS - $rabbit_heartbeat_in_pthread = undef, ) inherits swift { include swift::deps include swift::params @@ -274,7 +260,6 @@ class swift::proxy::ceilometer ( rabbit_quorum_delivery_limit => $rabbit_quorum_delivery_limit, 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, amqp_durable_queues => $amqp_durable_queues, amqp_auto_delete => $amqp_auto_delete, diff --git a/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-8a6f67a0eecb4edd.yaml b/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-8a6f67a0eecb4edd.yaml new file mode 100644 index 00000000..4d16d51e --- /dev/null +++ b/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-8a6f67a0eecb4edd.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The ``swift::proxy::ceilometer::rabbit_heartbeat_in_pthread`` parameter has + been removed. diff --git a/spec/classes/swift_proxy_ceilometer_spec.rb b/spec/classes/swift_proxy_ceilometer_spec.rb index 0b87f248..5a810c4a 100644 --- a/spec/classes/swift_proxy_ceilometer_spec.rb +++ b/spec/classes/swift_proxy_ceilometer_spec.rb @@ -83,7 +83,6 @@ describe 'swift::proxy::ceilometer' do :rabbit_transient_quorum_queue => '', :heartbeat_timeout_threshold => '', :heartbeat_rate => '', - :heartbeat_in_pthread => nil, :rabbit_qos_prefetch_count => '', :amqp_durable_queues => '', :amqp_auto_delete => '',