diff --git a/manifests/init.pp b/manifests/init.pp index e3fe3ae7..2967d4f2 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -51,16 +51,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'] @@ -160,6 +150,18 @@ # in the octavia 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 octavia ( $package_ensure = 'present', $default_transport_url = $facts['os_service_default'], @@ -169,7 +171,6 @@ class octavia ( $rabbit_use_ssl = $facts['os_service_default'], $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_quorum_queue = $facts['os_service_default'], $rabbit_transient_quorum_queue = $facts['os_service_default'], @@ -192,6 +193,8 @@ class octavia ( $notification_retry = $facts['os_service_default'], $topic = 'octavia-rpc', Boolean $purge_config = false, + # DEPRECATED PARAMETERS + $rabbit_heartbeat_in_pthread = undef, ) inherits octavia::params { include octavia::deps diff --git a/releasenotes/notes/deprecate-rabbit_heartbeat_in_pthread-d18828a91f93d95f.yaml b/releasenotes/notes/deprecate-rabbit_heartbeat_in_pthread-d18828a91f93d95f.yaml new file mode 100644 index 00000000..2e096513 --- /dev/null +++ b/releasenotes/notes/deprecate-rabbit_heartbeat_in_pthread-d18828a91f93d95f.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - | + The ``octavia::rabbit_heartbeat_in_pthread`` parameter has been deprecated + and will be removed in the future release.