Add 'heartbeat_timeout_threshold` option

This change adds the `heartbeat_timeout_threshold` option to the `oslo_messaging_rabbit` section. Closes-Bug: #1918673 Signed-off-by: Nicolas Bock <[email protected]>
juju · Mar 11, 2021 · c7ee659 · c7ee659
1 parent 29c9c2c
commit c7ee659
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/charmhelpers/contrib/openstack/context.py b/charmhelpers/contrib/openstack/context.py
@@ -768,6 +768,8 @@ def __call__(self):
         if send_notifications_to_logs:
             ctxt['send_notifications_to_logs'] = send_notifications_to_logs
 
+        ctxt['rabbit_heartbeat_timeout_threshold'] = conf.get('rabbit_heartbeat_timeout_threshold')
+
         if not self.complete:
             return {}
 

diff --git a/charmhelpers/contrib/openstack/templates/section-oslo-messaging-rabbit b/charmhelpers/contrib/openstack/templates/section-oslo-messaging-rabbit
@@ -8,3 +8,6 @@ ssl = True
 {% if rabbit_ssl_ca -%}
 ssl_ca_file = {{ rabbit_ssl_ca }}
 {% endif -%}
+{% if rabbit_heartbeat_timeout_threshold -%}
+heartbeat_timeout_threshold = {{ rabbit_heartbeat_timeout_threshold }}
+{% endif -%}