From 5259486ff4fde915e0f3f866b6d9c44fc98dedeb Mon Sep 17 00:00:00 2001 From: wenchma Date: Fri, 12 Jun 2015 15:01:46 +0800 Subject: [PATCH] Add rabbitmq max_retries and retry_interval in heat conf Oslo.message using rabbit_max_retries and rabbit_retry_interval to define reconnect rabbitmq server times and interval when can not connect to rabbitmq server. Change-Id: I261d3f31aa89f845d88ee4cbd1acb56c9131ba47 Closes-bug: #1439968 --- metadata.rb | 2 +- spec/spec_helper.rb | 8 ++++++++ templates/default/heat.conf.erb | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/metadata.rb b/metadata.rb index 4224716..e3f0468 100644 --- a/metadata.rb +++ b/metadata.rb @@ -18,5 +18,5 @@ recipe 'openstack-orchestration::identity_registration', 'Registers Heat service supports os end -depends 'openstack-common', '>= 11.0.0' +depends 'openstack-common', '>= 11.2.0' depends 'openstack-identity', '>= 11.0.0' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index d7a80eb..19f558b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -434,6 +434,14 @@ shared_examples 'expects to create heat conf' do expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^kombu_ssl_version=TLSv1.2$/) end + + it 'has the default rabbit_retry_interval set' do + expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_retry_interval=1$/) + end + + it 'has the default rabbit_max_retries set' do + expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_max_retries=0$/) + end end end end diff --git a/templates/default/heat.conf.erb b/templates/default/heat.conf.erb index 204fb4a..f86fffa 100644 --- a/templates/default/heat.conf.erb +++ b/templates/default/heat.conf.erb @@ -1417,7 +1417,7 @@ rabbit_virtual_host=<%= node["openstack"]["mq"]["orchestration"]["rabbit"]["vhos # How frequently to retry connecting with RabbitMQ. (integer # value) -#rabbit_retry_interval=1 +rabbit_retry_interval=<%= node["openstack"]["mq"]["orchestration"]["rabbit"]["rabbit_retry_interval"] %> # How long to backoff for between retries when connecting to # RabbitMQ. (integer value) @@ -1425,7 +1425,7 @@ rabbit_virtual_host=<%= node["openstack"]["mq"]["orchestration"]["rabbit"]["vhos # Maximum number of RabbitMQ connection retries. Default is 0 # (infinite retry count). (integer value) -#rabbit_max_retries=0 +rabbit_max_retries=<%= node["openstack"]["mq"]["orchestration"]["rabbit"]["rabbit_max_retries"] %> # Number of seconds after which the Rabbit broker is considered down if # heartbeat's keep-alive fails (0 disable the heartbeat). (integer value)