diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py index 9d99822d5..16df5deea 100644 --- a/oslo_messaging/_drivers/impl_rabbit.py +++ b/oslo_messaging/_drivers/impl_rabbit.py @@ -97,7 +97,7 @@ rabbit_opts = [ "example if the parent process has monkey patched the " "stdlib by using eventlet/greenlet then the heartbeat " "will be run through a green thread.", - deprecated_for_removal=True), + ), cfg.FloatOpt('kombu_reconnect_delay', default=1.0, deprecated_group='DEFAULT', diff --git a/releasenotes/notes/undeprecate_heartbeat_in_pthread-48e2c1fc008cf208.yaml b/releasenotes/notes/undeprecate_heartbeat_in_pthread-48e2c1fc008cf208.yaml new file mode 100644 index 000000000..4c71b9feb --- /dev/null +++ b/releasenotes/notes/undeprecate_heartbeat_in_pthread-48e2c1fc008cf208.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + We undeprecated the ``heartbeat_in_pthread`` option. This option will + remain available to allow customers to run the rabbitmq heartbeat in + python thread or not.