Browse Source

Allow oslo rabbit heartbeat configuration

In order to allow components to better handle and respond to mq failures,
oslo has some heartbeat options that are useful.

Change-Id: Ied6ad4af67f8915e91c7515f43121da9ee294456
Partial-Bug: #1462438
tags/kilo-eol
Mark Vanderwiel 4 years ago
parent
commit
ccac1491cf
2 changed files with 8 additions and 0 deletions
  1. 2
    0
      spec/server_spec.rb
  2. 6
    0
      templates/default/keystone.conf.erb

+ 2
- 0
spec/server_spec.rb View File

@@ -837,6 +837,8 @@ describe 'openstack-identity::server' do
837 837
         it 'has defaults for oslo_messaging_rabbit section' do
838 838
           [/^amqp_durable_queues = false$/,
839 839
            /^amqp_auto_delete = false$/,
840
+           /^heartbeat_timeout_threshold=0$/,
841
+           /^heartbeat_rate=2$/,
840 842
            /^rpc_conn_pool_size = 30$/,
841 843
            /^rabbit_host = 127.0.0.1$/,
842 844
            /^rabbit_port = 5672$/,

+ 6
- 0
templates/default/keystone.conf.erb View File

@@ -782,6 +782,12 @@ qpid_topology_version = <%= node['openstack']['mq']['identity']['qpid']['topolog
782 782
 # From oslo.messaging
783 783
 #
784 784
 
785
+# Number of seconds after which the Rabbit broker is considered down if heartbeat's keep-alive fails (0 disable the heartbeat)
786
+heartbeat_timeout_threshold=<%= node['openstack']['mq']['identity']['rabbit']['heartbeat_timeout_threshold'] %>
787
+
788
+# How often times during the heartbeat_timeout_threshold we check the heartbeat
789
+heartbeat_rate=<%= node['openstack']['mq']['identity']['rabbit']['heartbeat_rate'] %>
790
+
785 791
 # Use durable queues in AMQP. (boolean value)
786 792
 # Deprecated group/name - [DEFAULT]/rabbit_durable_queues
787 793
 #amqp_durable_queues = false

Loading…
Cancel
Save