Merge "Deprecate support for [oslo_messaging_rabbit] heartbeat_in_pthread"
This commit is contained in:
		@@ -27,16 +27,6 @@
 | 
				
			|||||||
#   every 30 seconds.
 | 
					#   every 30 seconds.
 | 
				
			||||||
#   Defaults to $facts['os_service_default'].
 | 
					#   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_quorum_queue*]
 | 
					# [*rabbit_quorum_queue*]
 | 
				
			||||||
#   (Optional) Use quorum queues in RabbitMQ.
 | 
					#   (Optional) Use quorum queues in RabbitMQ.
 | 
				
			||||||
#   Defaults to $facts['os_service_default']
 | 
					#   Defaults to $facts['os_service_default']
 | 
				
			||||||
@@ -196,12 +186,23 @@
 | 
				
			|||||||
#   (Optional) A hash of the metrics.yaml configuration.
 | 
					#   (Optional) A hash of the metrics.yaml configuration.
 | 
				
			||||||
#   Defaults to undef
 | 
					#   Defaults to undef
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
 | 
					# 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 cloudkitty(
 | 
					class cloudkitty(
 | 
				
			||||||
  $package_ensure                     = 'present',
 | 
					  $package_ensure                     = 'present',
 | 
				
			||||||
  $rabbit_use_ssl                     = $facts['os_service_default'],
 | 
					  $rabbit_use_ssl                     = $facts['os_service_default'],
 | 
				
			||||||
  $rabbit_heartbeat_timeout_threshold = $facts['os_service_default'],
 | 
					  $rabbit_heartbeat_timeout_threshold = $facts['os_service_default'],
 | 
				
			||||||
  $rabbit_heartbeat_rate              = $facts['os_service_default'],
 | 
					  $rabbit_heartbeat_rate              = $facts['os_service_default'],
 | 
				
			||||||
  $rabbit_heartbeat_in_pthread        = $facts['os_service_default'],
 | 
					 | 
				
			||||||
  $rabbit_ha_queues                   = $facts['os_service_default'],
 | 
					  $rabbit_ha_queues                   = $facts['os_service_default'],
 | 
				
			||||||
  $rabbit_quorum_queue                = $facts['os_service_default'],
 | 
					  $rabbit_quorum_queue                = $facts['os_service_default'],
 | 
				
			||||||
  $rabbit_transient_quorum_queue      = $facts['os_service_default'],
 | 
					  $rabbit_transient_quorum_queue      = $facts['os_service_default'],
 | 
				
			||||||
@@ -237,6 +238,8 @@ class cloudkitty(
 | 
				
			|||||||
  $storage_version                    = $facts['os_service_default'],
 | 
					  $storage_version                    = $facts['os_service_default'],
 | 
				
			||||||
  $fetcher_backend                    = $facts['os_service_default'],
 | 
					  $fetcher_backend                    = $facts['os_service_default'],
 | 
				
			||||||
  Optional[Hash] $metrics_config      = undef,
 | 
					  Optional[Hash] $metrics_config      = undef,
 | 
				
			||||||
 | 
					  # DEPRECATED PARAMETERS
 | 
				
			||||||
 | 
					  $rabbit_heartbeat_in_pthread        = undef,
 | 
				
			||||||
) {
 | 
					) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  include cloudkitty::params
 | 
					  include cloudkitty::params
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -0,0 +1,5 @@
 | 
				
			|||||||
 | 
					---
 | 
				
			||||||
 | 
					deprecations:
 | 
				
			||||||
 | 
					  - |
 | 
				
			||||||
 | 
					    The ``cloudkitty::rabbit_heartbeat_in_pthread`` parameter has been
 | 
				
			||||||
 | 
					    deprecated and will be removed in the future release.
 | 
				
			||||||
		Reference in New Issue
	
	Block a user