diff --git a/manifests/init.pp b/manifests/init.pp index c82c78440..3b675471b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -82,16 +82,6 @@ # every 30 seconds. # Defaults to $facts['os_service_default'] # -# [*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 $facts['os_service_default'] -# # [*rabbit_qos_prefetch_count*] # (Optional) Specifies the number of messages to prefetch. # Defaults to $facts['os_service_default'] @@ -366,6 +356,18 @@ # (Optional) Whether to use durable queues in AMQP. # 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 +# # == Authors # # Dan Bode dan@puppetlabs.com @@ -390,7 +392,6 @@ class keystone( Boolean $enabled = true, $rabbit_heartbeat_timeout_threshold = $facts['os_service_default'], $rabbit_heartbeat_rate = $facts['os_service_default'], - $rabbit_heartbeat_in_pthread = $facts['os_service_default'], $rabbit_qos_prefetch_count = $facts['os_service_default'], $rabbit_use_ssl = $facts['os_service_default'], $default_transport_url = $facts['os_service_default'], @@ -441,6 +442,8 @@ class keystone( $max_request_body_size = $facts['os_service_default'], Boolean $purge_config = false, $amqp_durable_queues = $facts['os_service_default'], + # DEPRECATED PARAMETERS + $rabbit_heartbeat_in_pthread = undef, ) inherits keystone::params { include keystone::deps diff --git a/releasenotes/notes/deprecate-rabbit_heartbeat_in_pthread-9916241580c88e38.yaml b/releasenotes/notes/deprecate-rabbit_heartbeat_in_pthread-9916241580c88e38.yaml new file mode 100644 index 000000000..0b90ae453 --- /dev/null +++ b/releasenotes/notes/deprecate-rabbit_heartbeat_in_pthread-9916241580c88e38.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - | + The ``keystone::rabbit_heartbeat_in_pthread`` parameter has been deprecated + and will be removed in the future release.